diff --git a/.github/workflows/scripts/linux/appimage-qt.sh b/.github/workflows/scripts/linux/appimage-qt.sh index 6e7bd44a5a..ba149b6ba5 100755 --- a/.github/workflows/scripts/linux/appimage-qt.sh +++ b/.github/workflows/scripts/linux/appimage-qt.sh @@ -280,7 +280,7 @@ Plugins = ../lib/plugins EOF echo "Copy desktop/icon..." -cp "$PCSX2DIR/pcsx2/gui/Resources/AppIcon64.png" "$OUTDIR/PCSX2.png" +cp "$PCSX2DIR/pcsx2/Resources/AppIcon64.png" "$OUTDIR/PCSX2.png" cp "$SCRIPTDIR/pcsx2-qt.desktop" "$OUTDIR/PCSX2.desktop" cp "$SCRIPTDIR/AppRun-qt" "$OUTDIR/AppRun" diff --git a/PCSX2_suite.sln b/PCSX2_suite.sln deleted file mode 100644 index f6e65a4b55..0000000000 --- a/PCSX2_suite.sln +++ /dev/null @@ -1,423 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31606.5 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdparty", "3rdparty", "{78EBE642-7A4D-4EA7-86BE-5639C6646C38}" - ProjectSection(SolutionItems) = preProject - 3rdparty\svn_readme.txt = 3rdparty\svn_readme.txt - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2D6F0A62-A247-4CCF-947F-FCD54BE16103}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2", "pcsx2\pcsx2.vcxproj", "{1CEFD830-2B76-4596-A4EE-BCD7280A60BD}" - ProjectSection(ProjectDependencies) = postProject - {12728250-16EC-4DC6-94D7-E21DD88947F8} = {12728250-16EC-4DC6-94D7-E21DD88947F8} - {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2cpp", "tools\bin2cpp\bin2c.vcxproj", "{677B7D11-D5E1-40B3-88B1-9A4DF83D2213}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "3rdparty\libjpeg\libjpeg.vcxproj", "{BC236261-77E8-4567-8D09-45CD02965EB6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_config", "3rdparty\wxwidgets3.0\build\msw\wx30_config.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_base", "3rdparty\wxwidgets3.0\build\msw\wx30_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_adv", "3rdparty\wxwidgets3.0\build\msw\wx30_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_core", "3rdparty\wxwidgets3.0\build\msw\wx30_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "3rdparty\libpng\projects\vstudio\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads4w", "3rdparty\pthreads4w\build\pthreads4w.vcxproj", "{0FAE817D-9A32-4830-857E-81DA57246E16}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "3rdparty\xz\liblzma.vcxproj", "{12728250-16EC-4DC6-94D7-E21DD88947F8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "3rdparty\fmt\fmt.vcxproj", "{449AD25E-424A-4714-BABC-68706CDCC33B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchdr", "3rdparty\libchdr\libchdr.vcxproj", "{A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpgd", "3rdparty\jpgd\jpgd.vcxproj", "{ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{4639972E-424E-4E13-8B07-CA403C481346}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glad", "3rdparty\glad\glad.vcxproj", "{C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ryml", "3rdparty\rapidyaml\ryml.vcxproj", "{DE9653B6-17DD-356A-9EE0-28A731772587}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cubeb", "3rdparty\cubeb\cubeb.vcxproj", "{BF74C473-DC04-44B3-92E8-4145F4E77342}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleini", "3rdparty\simpleini\simpleini.vcxproj", "{1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui", "3rdparty\imgui\imgui.vcxproj", "{88FB34EC-845E-4F21-A552-F1573B9ED167}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang", "3rdparty\glslang\glslang.vcxproj", "{EF6834A9-11F3-4331-BC34-21B325ABB180}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzip", "3rdparty\libzip\libzip.vcxproj", "{20B2E9FE-F020-42A0-B324-956F5B06EA68}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "3rdparty\zstd\zstd.vcxproj", "{52244028-937A-44E9-A76B-2BEA18FD239A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d3d12memalloc", "3rdparty\d3d12memalloc\d3d12memalloc.vcxproj", "{D45CEC7A-3171-40DD-975D-E1544CF16139}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzma", "3rdparty\lzma\lzma.vcxproj", "{A4323327-3F2B-4271-83D9-7F9A3C66B6B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug AVX2|x64 = Debug AVX2|x64 - Debug|x64 = Debug|x64 - Devel AVX2|x64 = Devel AVX2|x64 - Devel|x64 = Devel|x64 - Release AVX2|x64 = Release AVX2|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug AVX2|x64.ActiveCfg = Debug AVX2|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug AVX2|x64.Build.0 = Debug AVX2|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug|x64.ActiveCfg = Debug|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug|x64.Build.0 = Debug|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel AVX2|x64.ActiveCfg = Devel AVX2|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel AVX2|x64.Build.0 = Devel AVX2|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel|x64.ActiveCfg = Devel|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel|x64.Build.0 = Devel|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX2|x64.ActiveCfg = Release AVX2|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX2|x64.Build.0 = Release AVX2|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release|x64.ActiveCfg = Release|x64 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release|x64.Build.0 = Release|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Debug AVX2|x64.Build.0 = Debug|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Debug|x64.ActiveCfg = Debug|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Debug|x64.Build.0 = Debug|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Devel AVX2|x64.Build.0 = Devel|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Devel|x64.ActiveCfg = Devel|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Devel|x64.Build.0 = Devel|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Release AVX2|x64.ActiveCfg = Release|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Release AVX2|x64.Build.0 = Release|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Release|x64.ActiveCfg = Release|x64 - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Release|x64.Build.0 = Release|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug AVX2|x64.Build.0 = Debug|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug|x64.ActiveCfg = Debug|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug|x64.Build.0 = Debug|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel AVX2|x64.Build.0 = Devel|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel|x64.ActiveCfg = Devel|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel|x64.Build.0 = Devel|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX2|x64.ActiveCfg = Release|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX2|x64.Build.0 = Release|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|x64.ActiveCfg = Release|x64 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|x64.Build.0 = Release|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug AVX2|x64.Build.0 = Debug|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug|x64.ActiveCfg = Debug|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug|x64.Build.0 = Debug|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel AVX2|x64.Build.0 = Devel|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel|x64.ActiveCfg = Devel|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel|x64.Build.0 = Devel|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX2|x64.ActiveCfg = Release|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX2|x64.Build.0 = Release|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release|x64.ActiveCfg = Release|x64 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release|x64.Build.0 = Release|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug AVX2|x64.Build.0 = Debug|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug|x64.ActiveCfg = Debug|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug|x64.Build.0 = Debug|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel AVX2|x64.Build.0 = Devel|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel|x64.ActiveCfg = Devel|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel|x64.Build.0 = Devel|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX2|x64.ActiveCfg = Release|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX2|x64.Build.0 = Release|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release|x64.ActiveCfg = Release|x64 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release|x64.Build.0 = Release|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug AVX2|x64.Build.0 = Debug|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.ActiveCfg = Debug|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.Build.0 = Debug|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Devel AVX2|x64.Build.0 = Devel|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Devel|x64.ActiveCfg = Devel|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Devel|x64.Build.0 = Devel|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release AVX2|x64.ActiveCfg = Release|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release AVX2|x64.Build.0 = Release|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|x64.ActiveCfg = Release|x64 - {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|x64.Build.0 = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug AVX2|x64.Build.0 = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Devel AVX2|x64.Build.0 = Devel|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Devel|x64.ActiveCfg = Devel|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Devel|x64.Build.0 = Devel|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release AVX2|x64.ActiveCfg = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release AVX2|x64.Build.0 = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug AVX2|x64.Build.0 = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.ActiveCfg = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Devel AVX2|x64.Build.0 = Devel|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Devel|x64.ActiveCfg = Devel|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Devel|x64.Build.0 = Devel|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release AVX2|x64.ActiveCfg = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release AVX2|x64.Build.0 = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.ActiveCfg = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.Build.0 = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug AVX2|x64.Build.0 = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Devel AVX2|x64.Build.0 = Devel|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Devel|x64.ActiveCfg = Devel|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Devel|x64.Build.0 = Devel|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release AVX2|x64.ActiveCfg = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release AVX2|x64.Build.0 = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug AVX2|x64.Build.0 = Debug|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel AVX2|x64.Build.0 = Devel|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel|x64.ActiveCfg = Devel|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel|x64.Build.0 = Devel|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX2|x64.ActiveCfg = Release|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX2|x64.Build.0 = Release|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Debug AVX2|x64.Build.0 = Debug|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Debug|x64.ActiveCfg = Debug|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Debug|x64.Build.0 = Debug|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Devel AVX2|x64.Build.0 = Devel|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Devel|x64.ActiveCfg = Devel|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Devel|x64.Build.0 = Devel|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Release AVX2|x64.ActiveCfg = Release|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Release AVX2|x64.Build.0 = Release|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Release|x64.ActiveCfg = Release|x64 - {0FAE817D-9A32-4830-857E-81DA57246E16}.Release|x64.Build.0 = Release|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Debug AVX2|x64.Build.0 = Debug|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Debug|x64.ActiveCfg = Debug|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Debug|x64.Build.0 = Debug|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Devel AVX2|x64.Build.0 = Devel|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Devel|x64.ActiveCfg = Devel|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Devel|x64.Build.0 = Devel|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Release AVX2|x64.ActiveCfg = Release|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Release AVX2|x64.Build.0 = Release|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Release|x64.ActiveCfg = Release|x64 - {12728250-16EC-4DC6-94D7-E21DD88947F8}.Release|x64.Build.0 = Release|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Debug AVX2|x64.Build.0 = Debug|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Debug|x64.ActiveCfg = Debug|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Debug|x64.Build.0 = Debug|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Devel AVX2|x64.Build.0 = Devel|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Devel|x64.ActiveCfg = Devel|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Devel|x64.Build.0 = Devel|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Release AVX2|x64.ActiveCfg = Release|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Release AVX2|x64.Build.0 = Release|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Release|x64.ActiveCfg = Release|x64 - {449AD25E-424A-4714-BABC-68706CDCC33B}.Release|x64.Build.0 = Release|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Debug AVX2|x64.Build.0 = Debug|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Debug|x64.ActiveCfg = Debug|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Debug|x64.Build.0 = Debug|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Devel AVX2|x64.Build.0 = Devel|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Devel|x64.ActiveCfg = Devel|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Devel|x64.Build.0 = Devel|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Release AVX2|x64.ActiveCfg = Release|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Release AVX2|x64.Build.0 = Release|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Release|x64.ActiveCfg = Release|x64 - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Release|x64.Build.0 = Release|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Debug AVX2|x64.Build.0 = Debug|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Debug|x64.ActiveCfg = Debug|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Debug|x64.Build.0 = Debug|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Devel AVX2|x64.Build.0 = Devel|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Devel|x64.ActiveCfg = Devel|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Devel|x64.Build.0 = Devel|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Release AVX2|x64.ActiveCfg = Release|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Release AVX2|x64.Build.0 = Release|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Release|x64.ActiveCfg = Release|x64 - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Release|x64.Build.0 = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|x64.Build.0 = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.ActiveCfg = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.Build.0 = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|x64.Build.0 = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.ActiveCfg = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.Build.0 = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.ActiveCfg = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.Build.0 = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.ActiveCfg = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.Build.0 = Release|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Debug AVX2|x64.Build.0 = Debug|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Debug|x64.ActiveCfg = Debug|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Debug|x64.Build.0 = Debug|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Devel AVX2|x64.Build.0 = Devel|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Devel|x64.ActiveCfg = Devel|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Devel|x64.Build.0 = Devel|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Release AVX2|x64.ActiveCfg = Release|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Release AVX2|x64.Build.0 = Release|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Release|x64.ActiveCfg = Release|x64 - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}.Release|x64.Build.0 = Release|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Debug AVX2|x64.Build.0 = Debug|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Debug|x64.ActiveCfg = Debug|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Debug|x64.Build.0 = Debug|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Devel AVX2|x64.Build.0 = Devel|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Devel|x64.ActiveCfg = Devel|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Devel|x64.Build.0 = Devel|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Release AVX2|x64.ActiveCfg = Release|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Release AVX2|x64.Build.0 = Release|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Release|x64.ActiveCfg = Release|x64 - {DE9653B6-17DD-356A-9EE0-28A731772587}.Release|x64.Build.0 = Release|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Debug AVX2|x64.Build.0 = Debug|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Debug|x64.ActiveCfg = Debug|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Debug|x64.Build.0 = Debug|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Devel AVX2|x64.Build.0 = Devel|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Devel|x64.ActiveCfg = Devel|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Devel|x64.Build.0 = Devel|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Release AVX2|x64.ActiveCfg = Release|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Release AVX2|x64.Build.0 = Release|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Release|x64.ActiveCfg = Release|x64 - {BF74C473-DC04-44B3-92E8-4145F4E77342}.Release|x64.Build.0 = Release|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Debug AVX2|x64.Build.0 = Debug|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Debug|x64.ActiveCfg = Debug|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Debug|x64.Build.0 = Debug|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Devel AVX2|x64.Build.0 = Devel|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Devel|x64.ActiveCfg = Devel|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Devel|x64.Build.0 = Devel|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Release AVX2|x64.ActiveCfg = Release|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Release AVX2|x64.Build.0 = Release|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Release|x64.ActiveCfg = Release|x64 - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266}.Release|x64.Build.0 = Release|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Debug AVX2|x64.Build.0 = Debug|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Debug|x64.ActiveCfg = Debug|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Debug|x64.Build.0 = Debug|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Devel AVX2|x64.Build.0 = Devel|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Devel|x64.ActiveCfg = Devel|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Devel|x64.Build.0 = Devel|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Release AVX2|x64.ActiveCfg = Release|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Release AVX2|x64.Build.0 = Release|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Release|x64.ActiveCfg = Release|x64 - {88FB34EC-845E-4F21-A552-F1573B9ED167}.Release|x64.Build.0 = Release|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Debug AVX2|x64.Build.0 = Debug|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Debug|x64.ActiveCfg = Debug|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Debug|x64.Build.0 = Debug|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Devel AVX2|x64.Build.0 = Devel|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Devel|x64.ActiveCfg = Devel|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Devel|x64.Build.0 = Devel|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Release AVX2|x64.ActiveCfg = Release|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Release AVX2|x64.Build.0 = Release|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Release|x64.ActiveCfg = Release|x64 - {EF6834A9-11F3-4331-BC34-21B325ABB180}.Release|x64.Build.0 = Release|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Debug AVX2|x64.Build.0 = Debug|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Debug|x64.ActiveCfg = Debug|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Debug|x64.Build.0 = Debug|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Devel AVX2|x64.Build.0 = Devel|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Devel|x64.ActiveCfg = Devel|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Devel|x64.Build.0 = Devel|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Release AVX2|x64.ActiveCfg = Release|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Release AVX2|x64.Build.0 = Release|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Release|x64.ActiveCfg = Release|x64 - {20B2E9FE-F020-42A0-B324-956F5B06EA68}.Release|x64.Build.0 = Release|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Debug AVX2|x64.Build.0 = Debug|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Debug|x64.ActiveCfg = Debug|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Debug|x64.Build.0 = Debug|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Devel AVX2|x64.Build.0 = Devel|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Devel|x64.ActiveCfg = Devel|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Devel|x64.Build.0 = Devel|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Release AVX2|x64.ActiveCfg = Release|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Release AVX2|x64.Build.0 = Release|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Release|x64.ActiveCfg = Release|x64 - {52244028-937A-44E9-A76B-2BEA18FD239A}.Release|x64.Build.0 = Release|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Debug AVX2|x64.Build.0 = Debug|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Debug|x64.ActiveCfg = Debug|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Debug|x64.Build.0 = Debug|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Devel AVX2|x64.Build.0 = Devel|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Devel|x64.ActiveCfg = Devel|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Devel|x64.Build.0 = Devel|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Release AVX2|x64.ActiveCfg = Release|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Release AVX2|x64.Build.0 = Release|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Release|x64.ActiveCfg = Release|x64 - {D45CEC7A-3171-40DD-975D-E1544CF16139}.Release|x64.Build.0 = Release|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Debug AVX2|x64.Build.0 = Debug|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Debug|x64.ActiveCfg = Debug|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Debug|x64.Build.0 = Debug|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Devel AVX2|x64.Build.0 = Devel|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Devel|x64.ActiveCfg = Devel|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Devel|x64.Build.0 = Devel|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Release AVX2|x64.ActiveCfg = Release|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Release AVX2|x64.Build.0 = Release|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Release|x64.ActiveCfg = Release|x64 - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213} = {2D6F0A62-A247-4CCF-947F-FCD54BE16103} - {BC236261-77E8-4567-8D09-45CD02965EB6} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {0FAE817D-9A32-4830-857E-81DA57246E16} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {12728250-16EC-4DC6-94D7-E21DD88947F8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {449AD25E-424A-4714-BABC-68706CDCC33B} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {DE9653B6-17DD-356A-9EE0-28A731772587} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {BF74C473-DC04-44B3-92E8-4145F4E77342} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {1EC8B3C0-8FB3-46DE-A2E0-A9121203F266} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {88FB34EC-845E-4F21-A552-F1573B9ED167} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {EF6834A9-11F3-4331-BC34-21B325ABB180} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {20B2E9FE-F020-42A0-B324-956F5B06EA68} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {52244028-937A-44E9-A76B-2BEA18FD239A} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {D45CEC7A-3171-40DD-975D-E1544CF16139} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {A4323327-3F2B-4271-83D9-7F9A3C66B6B2} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0BC474EA-3628-45D3-9DBC-E22D0B7E0F77} - EndGlobalSection -EndGlobal diff --git a/bin/PCSX2_keys.ini.default b/bin/PCSX2_keys.ini.default deleted file mode 100644 index 70b275813d..0000000000 --- a/bin/PCSX2_keys.ini.default +++ /dev/null @@ -1,94 +0,0 @@ -# IMPORTANT: PCSX2 only looks for PCSX2_keys.ini at the inis folder. -# You should first copy PCSX2_keys.ini.default to the inis folder, then -# rename it to PCSX2_keys.ini, and then edit it. - -# Important: PAD bindings will override shortcuts at this file. - -# IMPORTANT: GS has fixed shortcuts. Make sure your shortcuts don't conflict. -# Also, they will affect GS also when alt/ctrl/shift are pressed, so it's -# best to completely avoid them at this file. GS uses: -# F5 - Deinterlace modes -# PAGE_UP - FXAA antialiasing (HW and SW) -# PAGE_DOWN - Cycles through dither modes (HW) -# DELETE - Software Antialiasing (AA1) -# HOME - FX shader -# INSERT - Hardware mipmapping - -# ----------------------------------------------------------------------------- -# The KB shortcuts can be a normal key (e.g. f or ] etc) or a combination of -# ALT/SHIFT/CTRL and a key, separated with a - or + (e.g. m or alt+ctrl+m or -# alt-F12). Number (key) pad names start with KP_ (e.g. KP_0 to KP_9, KP_ADD). - -# Note: If the Dev console source is enabled, keypresses (including with Alt -# etc) will be printed to the console and could be copied to PCSX2_keys.ini . - -# List of special key names (beyond KP_0 to KP_9 and normal keys): -# DEL DELETE BACK INS INSERT ENTER RETURN PGUP PGDN LEFT RIGHT UP DOWN HOME END -# SPACE TAB ESC ESCAPE CANCEL CLEAR MENU PAUSE CAPITAL SELECT PRINT EXECUTE -# SNAPSHOT HELP ADD SEPARATOR SUBTRACT DECIMAL DIVIDE NUM_LOCK SCROLL_LOCK -# PAGEUP PAGEDOWN KP_SPACE KP_TAB KP_ENTER KP_HOME KP_LEFT KP_UP KP_RIGHT -# KP_DOWN KP_PRIOR KP_PAGEUP KP_NEXT KP_PAGEDOWN KP_END KP_BEGIN KP_INSERT -# KP_DELETE KP_EQUAL KP_MULTIPLY KP_ADD KP_SEPARATOR KP_SUBTRACT KP_DECIMAL -# KP_DIVIDE WINDOWS_LEFT WINDOWS_RIGHT WINDOWS_MENU COMMAND - -# save state: freeze is save state, defrost is load state. -States_FreezeCurrentSlot = F1 -States_DefrostCurrentSlot = F3 -States_DefrostCurrentSlotBackup = Shift-F3 -States_CycleSlotForward = F2 -States_CycleSlotBackward = Shift-F2 - -FullscreenToggle = Alt-ENTER - -# Note: toggles suspend, but can resume only if the GS window is not set to hide -# when paused (Emu options -> GS window), and when the GS window is focused. -Sys_SuspendResume = ESC - -# Screenshot. Note: must not include shift or ctrl. With these held - it will -# create debug GS dump. The two other shortcuts will be added automatically. -Sys_TakeSnapshot = F8 - -# Hardware/software rendering toggle -Sys_RenderswitchToggle = F9 - -Sys_LoggingToggle = F10 -Sys_RecordingToggle = F12 - -GSwindow_CycleAspectRatio = F6 - -# Vertical stretch/squash -GSwindow_ZoomInY = Alt-Ctrl-KP_ADD -GSwindow_ZoomOutY = Alt-Ctrl-KP_SUBTRACT -GSwindow_ZoomResetY = Alt-Ctrl-KP_MULTIPLY - -# Recording Bindings -# Note - These are disabled if 'System > Enable Recording Tools' is disabled -FrameAdvance = SPACE -TogglePause = Shift-P -InputRecordingModeToggle = Shift-R - -# Note - This is disabled if no input recording is active -GoToFirstFrame = Shift-L - -# Save State Management -# Note - These are disabled if 'System > Enable Recording Tools' is disabled -States_SaveSlot0 = Shift-KP_0 -States_SaveSlot1 = Shift-KP_1 -States_SaveSlot2 = Shift-KP_2 -States_SaveSlot3 = Shift-KP_3 -States_SaveSlot4 = Shift-KP_4 -States_SaveSlot5 = Shift-KP_5 -States_SaveSlot6 = Shift-KP_6 -States_SaveSlot7 = Shift-KP_7 -States_SaveSlot8 = Shift-KP_8 -States_SaveSlot9 = Shift-KP_9 -States_LoadSlot0 = KP_0 -States_LoadSlot1 = KP_1 -States_LoadSlot2 = KP_2 -States_LoadSlot3 = KP_3 -States_LoadSlot4 = KP_4 -States_LoadSlot5 = KP_5 -States_LoadSlot6 = KP_6 -States_LoadSlot7 = KP_7 -States_LoadSlot8 = KP_8 -States_LoadSlot9 = KP_9 diff --git a/bin/resources/locale/ar_SA/pcsx2_Iconized.mo b/bin/resources/locale/ar_SA/pcsx2_Iconized.mo deleted file mode 100644 index c6a551680f..0000000000 Binary files a/bin/resources/locale/ar_SA/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/ar_SA/pcsx2_Main.mo b/bin/resources/locale/ar_SA/pcsx2_Main.mo deleted file mode 100644 index b3eef0fa81..0000000000 Binary files a/bin/resources/locale/ar_SA/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/ca_ES/pcsx2_Iconized.mo b/bin/resources/locale/ca_ES/pcsx2_Iconized.mo deleted file mode 100644 index a12aa7bcc4..0000000000 Binary files a/bin/resources/locale/ca_ES/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/ca_ES/pcsx2_Main.mo b/bin/resources/locale/ca_ES/pcsx2_Main.mo deleted file mode 100644 index 1bb73cc957..0000000000 Binary files a/bin/resources/locale/ca_ES/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/cs_CZ/pcsx2_Iconized.mo b/bin/resources/locale/cs_CZ/pcsx2_Iconized.mo deleted file mode 100644 index c9008d7133..0000000000 Binary files a/bin/resources/locale/cs_CZ/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/cs_CZ/pcsx2_Main.mo b/bin/resources/locale/cs_CZ/pcsx2_Main.mo deleted file mode 100644 index af92a4383e..0000000000 Binary files a/bin/resources/locale/cs_CZ/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/da_DK/pcsx2_Iconized.mo b/bin/resources/locale/da_DK/pcsx2_Iconized.mo deleted file mode 100644 index 4e77ac5de0..0000000000 Binary files a/bin/resources/locale/da_DK/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/da_DK/pcsx2_Main.mo b/bin/resources/locale/da_DK/pcsx2_Main.mo deleted file mode 100644 index 5c2ae91fb6..0000000000 Binary files a/bin/resources/locale/da_DK/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/de_DE/pcsx2_Iconized.mo b/bin/resources/locale/de_DE/pcsx2_Iconized.mo deleted file mode 100644 index bc307a8cd8..0000000000 Binary files a/bin/resources/locale/de_DE/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/de_DE/pcsx2_Main.mo b/bin/resources/locale/de_DE/pcsx2_Main.mo deleted file mode 100644 index 4f4238789d..0000000000 Binary files a/bin/resources/locale/de_DE/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/es_ES/pcsx2_Iconized.mo b/bin/resources/locale/es_ES/pcsx2_Iconized.mo deleted file mode 100644 index 5375b8df1e..0000000000 Binary files a/bin/resources/locale/es_ES/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/es_ES/pcsx2_Main.mo b/bin/resources/locale/es_ES/pcsx2_Main.mo deleted file mode 100644 index 1bdb9c28fa..0000000000 Binary files a/bin/resources/locale/es_ES/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/fi_FI/pcsx2_Iconized.mo b/bin/resources/locale/fi_FI/pcsx2_Iconized.mo deleted file mode 100644 index 50f8e111df..0000000000 Binary files a/bin/resources/locale/fi_FI/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/fi_FI/pcsx2_Main.mo b/bin/resources/locale/fi_FI/pcsx2_Main.mo deleted file mode 100644 index f385f74f62..0000000000 Binary files a/bin/resources/locale/fi_FI/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/fr_FR/pcsx2_Iconized.mo b/bin/resources/locale/fr_FR/pcsx2_Iconized.mo deleted file mode 100644 index 9879bae3d2..0000000000 Binary files a/bin/resources/locale/fr_FR/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/fr_FR/pcsx2_Main.mo b/bin/resources/locale/fr_FR/pcsx2_Main.mo deleted file mode 100644 index 43b9523c48..0000000000 Binary files a/bin/resources/locale/fr_FR/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/hr_HR/pcsx2_Iconized.mo b/bin/resources/locale/hr_HR/pcsx2_Iconized.mo deleted file mode 100644 index a98d02df96..0000000000 Binary files a/bin/resources/locale/hr_HR/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/hr_HR/pcsx2_Main.mo b/bin/resources/locale/hr_HR/pcsx2_Main.mo deleted file mode 100644 index 2fbcec06ea..0000000000 Binary files a/bin/resources/locale/hr_HR/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/hu_HU/pcsx2_Iconized.mo b/bin/resources/locale/hu_HU/pcsx2_Iconized.mo deleted file mode 100644 index efd0c1c031..0000000000 Binary files a/bin/resources/locale/hu_HU/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/hu_HU/pcsx2_Main.mo b/bin/resources/locale/hu_HU/pcsx2_Main.mo deleted file mode 100644 index 448be614bb..0000000000 Binary files a/bin/resources/locale/hu_HU/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/id_ID/pcsx2_Iconized.mo b/bin/resources/locale/id_ID/pcsx2_Iconized.mo deleted file mode 100644 index 46d7f6343d..0000000000 Binary files a/bin/resources/locale/id_ID/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/id_ID/pcsx2_Main.mo b/bin/resources/locale/id_ID/pcsx2_Main.mo deleted file mode 100644 index 20be4e3b5e..0000000000 Binary files a/bin/resources/locale/id_ID/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/it_IT/pcsx2_Iconized.mo b/bin/resources/locale/it_IT/pcsx2_Iconized.mo deleted file mode 100644 index 59a332e897..0000000000 Binary files a/bin/resources/locale/it_IT/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/it_IT/pcsx2_Main.mo b/bin/resources/locale/it_IT/pcsx2_Main.mo deleted file mode 100644 index bb0b6b36f4..0000000000 Binary files a/bin/resources/locale/it_IT/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/ja_JP/pcsx2_Iconized.mo b/bin/resources/locale/ja_JP/pcsx2_Iconized.mo deleted file mode 100644 index 6cced63a36..0000000000 Binary files a/bin/resources/locale/ja_JP/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/ja_JP/pcsx2_Main.mo b/bin/resources/locale/ja_JP/pcsx2_Main.mo deleted file mode 100644 index e04164bc07..0000000000 Binary files a/bin/resources/locale/ja_JP/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/ko_KR/pcsx2_Iconized.mo b/bin/resources/locale/ko_KR/pcsx2_Iconized.mo deleted file mode 100644 index 8b7c5ec028..0000000000 Binary files a/bin/resources/locale/ko_KR/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/ko_KR/pcsx2_Main.mo b/bin/resources/locale/ko_KR/pcsx2_Main.mo deleted file mode 100644 index 1619dff414..0000000000 Binary files a/bin/resources/locale/ko_KR/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/lt_LT/pcsx2_Iconized.mo b/bin/resources/locale/lt_LT/pcsx2_Iconized.mo deleted file mode 100644 index e70bc73d1a..0000000000 Binary files a/bin/resources/locale/lt_LT/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/lt_LT/pcsx2_Main.mo b/bin/resources/locale/lt_LT/pcsx2_Main.mo deleted file mode 100644 index a4c623ee68..0000000000 Binary files a/bin/resources/locale/lt_LT/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/ms_MY/pcsx2_Iconized.mo b/bin/resources/locale/ms_MY/pcsx2_Iconized.mo deleted file mode 100644 index 0cae630ca3..0000000000 Binary files a/bin/resources/locale/ms_MY/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/ms_MY/pcsx2_Main.mo b/bin/resources/locale/ms_MY/pcsx2_Main.mo deleted file mode 100644 index 7c6e7cfc69..0000000000 Binary files a/bin/resources/locale/ms_MY/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/nb_NO/pcsx2_Iconized.mo b/bin/resources/locale/nb_NO/pcsx2_Iconized.mo deleted file mode 100644 index 2c7d8ec885..0000000000 Binary files a/bin/resources/locale/nb_NO/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/nb_NO/pcsx2_Main.mo b/bin/resources/locale/nb_NO/pcsx2_Main.mo deleted file mode 100644 index 8389f7ea63..0000000000 Binary files a/bin/resources/locale/nb_NO/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/nl_NL/pcsx2_Iconized.mo b/bin/resources/locale/nl_NL/pcsx2_Iconized.mo deleted file mode 100644 index 107f76a6ee..0000000000 Binary files a/bin/resources/locale/nl_NL/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/nl_NL/pcsx2_Main.mo b/bin/resources/locale/nl_NL/pcsx2_Main.mo deleted file mode 100644 index 73640c4300..0000000000 Binary files a/bin/resources/locale/nl_NL/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/pl_PL/pcsx2_Iconized.mo b/bin/resources/locale/pl_PL/pcsx2_Iconized.mo deleted file mode 100644 index 41bb823568..0000000000 Binary files a/bin/resources/locale/pl_PL/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/pl_PL/pcsx2_Main.mo b/bin/resources/locale/pl_PL/pcsx2_Main.mo deleted file mode 100644 index 191cdb0afa..0000000000 Binary files a/bin/resources/locale/pl_PL/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/pt_BR/pcsx2_Iconized.mo b/bin/resources/locale/pt_BR/pcsx2_Iconized.mo deleted file mode 100644 index 8a58f1630d..0000000000 Binary files a/bin/resources/locale/pt_BR/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/pt_BR/pcsx2_Main.mo b/bin/resources/locale/pt_BR/pcsx2_Main.mo deleted file mode 100644 index b55d491b21..0000000000 Binary files a/bin/resources/locale/pt_BR/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/ru_RU/pcsx2_Iconized.mo b/bin/resources/locale/ru_RU/pcsx2_Iconized.mo deleted file mode 100644 index 40ab5e944f..0000000000 Binary files a/bin/resources/locale/ru_RU/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/ru_RU/pcsx2_Main.mo b/bin/resources/locale/ru_RU/pcsx2_Main.mo deleted file mode 100644 index a6f640c9a2..0000000000 Binary files a/bin/resources/locale/ru_RU/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/sv_SE/pcsx2_Iconized.mo b/bin/resources/locale/sv_SE/pcsx2_Iconized.mo deleted file mode 100644 index b54865e4f4..0000000000 Binary files a/bin/resources/locale/sv_SE/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/sv_SE/pcsx2_Main.mo b/bin/resources/locale/sv_SE/pcsx2_Main.mo deleted file mode 100644 index dde9006c78..0000000000 Binary files a/bin/resources/locale/sv_SE/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/th_TH/pcsx2_Iconized.mo b/bin/resources/locale/th_TH/pcsx2_Iconized.mo deleted file mode 100644 index 81b6add64c..0000000000 Binary files a/bin/resources/locale/th_TH/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/th_TH/pcsx2_Main.mo b/bin/resources/locale/th_TH/pcsx2_Main.mo deleted file mode 100644 index 2fb5e125fe..0000000000 Binary files a/bin/resources/locale/th_TH/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/tr_TR/pcsx2_Iconized.mo b/bin/resources/locale/tr_TR/pcsx2_Iconized.mo deleted file mode 100644 index da809da26e..0000000000 Binary files a/bin/resources/locale/tr_TR/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/tr_TR/pcsx2_Main.mo b/bin/resources/locale/tr_TR/pcsx2_Main.mo deleted file mode 100644 index 48846a935a..0000000000 Binary files a/bin/resources/locale/tr_TR/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/zh_CN/pcsx2_Iconized.mo b/bin/resources/locale/zh_CN/pcsx2_Iconized.mo deleted file mode 100644 index 0a486e734f..0000000000 Binary files a/bin/resources/locale/zh_CN/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/zh_CN/pcsx2_Main.mo b/bin/resources/locale/zh_CN/pcsx2_Main.mo deleted file mode 100644 index 33326121a8..0000000000 Binary files a/bin/resources/locale/zh_CN/pcsx2_Main.mo and /dev/null differ diff --git a/bin/resources/locale/zh_TW/pcsx2_Iconized.mo b/bin/resources/locale/zh_TW/pcsx2_Iconized.mo deleted file mode 100644 index 9971409a44..0000000000 Binary files a/bin/resources/locale/zh_TW/pcsx2_Iconized.mo and /dev/null differ diff --git a/bin/resources/locale/zh_TW/pcsx2_Main.mo b/bin/resources/locale/zh_TW/pcsx2_Main.mo deleted file mode 100644 index 8490902a4f..0000000000 Binary files a/bin/resources/locale/zh_TW/pcsx2_Main.mo and /dev/null differ diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 8f3340988d..db548e96a1 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1373,11 +1373,11 @@ function(setup_main_executable target) set_target_properties(${target} PROPERTIES MACOSX_BUNDLE true - MACOSX_BUNDLE_INFO_PLIST "${PCSX2_SOURCE_DIR}/gui/Resources/Info.plist.in" + MACOSX_BUNDLE_INFO_PLIST "${PCSX2_SOURCE_DIR}/Resources/Info.plist.in" OUTPUT_NAME PCSX2 ) - pcsx2_resource(${target} ${PCSX2_SOURCE_DIR}/gui/Resources/PCSX2.icns ${PCSX2_SOURCE_DIR}/gui/Resources) + pcsx2_resource(${target} ${PCSX2_SOURCE_DIR}/Resources/PCSX2.icns ${PCSX2_SOURCE_DIR}/Resources) # If they say to skip postprocess bundle, leave the target in but make it so they have # to manually run it diff --git a/pcsx2/DEV9/ATA/HddCreateWx.cpp b/pcsx2/DEV9/ATA/HddCreateWx.cpp deleted file mode 100644 index 885bbe1bc3..0000000000 --- a/pcsx2/DEV9/ATA/HddCreateWx.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "HddCreateWx.h" -#include "gui/App.h" - -void HddCreateWx::Init() -{ - //This can be called from the EE Core thread - //ensure that UI creation/deletaion is done on main thread - //Also block calling thread untill ui is ready - if (!wxIsMainThread()) - { - dialogReady = false; - wxTheApp->CallAfter([&] { Init(); }); - //Block until done - std::unique_lock loadLock(dialogMutex); - dialogCV.wait(loadLock, [&] { return dialogReady; }); - return; - } - - reqMiB = (neededSize + ((1024 * 1024) - 1)) / (1024 * 1024); - //This creates a modeless dialog - progressDialog = new wxProgressDialog(_("Creating HDD file"), _("Creating HDD file"), reqMiB, nullptr, wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_REMAINING_TIME); - { - std::lock_guard dialogLock1(dialogMutex); - dialogReady = true; - } - dialogCV.notify_all(); -} - -void HddCreateWx::SetFileProgress(u64 currentSize) -{ - if (!wxIsMainThread()) - { - wxTheApp->CallAfter([&, currentSize] { SetFileProgress(currentSize); }); - return; - } - - wxString msg; - - const int writtenMB = (currentSize + ((1024 * 1024) - 1)) / (1024 * 1024); - msg.Printf(_("%i / %i MiB"), writtenMB, reqMiB); - - if (!progressDialog->Update(writtenMB, msg)) - SetCanceled(); -} - -void HddCreateWx::SetError() -{ - if (!wxIsMainThread()) - { - dialogReady = false; - wxTheApp->CallAfter([&] { SetError(); }); - //Block until done - std::unique_lock loadLock(dialogMutex); - dialogCV.wait(loadLock, [&] { return dialogReady; }); - return; - } - - wxMessageDialog dialog(nullptr, _("Failed to create HDD file"), _("Info"), wxOK); - dialog.ShowModal(); - { - std::lock_guard dialogLock1(dialogMutex); - dialogReady = true; - } - dialogCV.notify_all(); -} - -void HddCreateWx::Cleanup() -{ - if (!wxIsMainThread()) - { - dialogReady = false; - wxTheApp->CallAfter([&] { Cleanup(); }); - //Block until done - std::unique_lock loadLock(dialogMutex); - dialogCV.wait(loadLock, [&] { return dialogReady; }); - return; - } - - delete progressDialog; - - { - std::lock_guard dialogLock1(dialogMutex); - dialogReady = true; - } - dialogCV.notify_all(); -} diff --git a/pcsx2/DEV9/ATA/HddCreateWx.h b/pcsx2/DEV9/ATA/HddCreateWx.h deleted file mode 100644 index 876f6c7dbf..0000000000 --- a/pcsx2/DEV9/ATA/HddCreateWx.h +++ /dev/null @@ -1,45 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - -#include -#include - -#include "DEV9/ATA/HddCreate.h" - -class HddCreateWx : public HddCreate -{ -public: - HddCreateWx(){}; - virtual ~HddCreateWx(){}; - -private: - wxProgressDialog* progressDialog; - - std::mutex dialogMutex; - std::condition_variable dialogCV; - bool dialogReady = false; - - int reqMiB; - -protected: - virtual void Init(); - virtual void Cleanup(); - virtual void SetFileProgress(u64 currentSize); - virtual void SetError(); -}; diff --git a/pcsx2/DEV9/ConfigUI.cpp b/pcsx2/DEV9/ConfigUI.cpp deleted file mode 100644 index 2df7d91496..0000000000 --- a/pcsx2/DEV9/ConfigUI.cpp +++ /dev/null @@ -1,439 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include - -#include - -#include -#include -#include -#include -#include -#include - -#include "common/FileSystem.h" -#include "common/Path.h" -#include "common/StringUtil.h" - -#include "Config.h" -#include "DEV9.h" -#include "pcap_io.h" -#include "sockets.h" -#include "net.h" -#include "PacketReader/IP/IP_Address.h" -#include "gui/AppCoreThread.h" -#ifdef _WIN32 - #include "Win32/tap.h" -#endif - -#include "ATA/HddCreateWx.h" - -using PacketReader::IP::IP_Address; - -class DEV9Dialog : public wxDialog -{ - static void IPControl_SetValue(wxTextCtrl* ctl, IP_Address value) - { - ctl->SetValue(wxString::Format("%u.%u.%u.%u", value.bytes[0], value.bytes[1], value.bytes[2], value.bytes[3])); - } - - static IP_Address IPControl_GetValue(wxTextCtrl* ctl) - { - IP_Address ret; - if (4 == wxSscanf(ctl->GetValue(), "%hhu.%hhu.%hhu.%hhu", &ret.bytes[0], &ret.bytes[1], &ret.bytes[2], &ret.bytes[3])) - return ret; - Console.Error("Invalid IP address entered"); - return {}; - } - - struct IPInputWithAutoCheck - { - wxTextCtrl* m_ip; - wxCheckBox* m_auto; - void create(int col, wxWindow* window, wxGridBagSizer* sizer, const wxString& label) - { - auto* label_box = new wxStaticText(window, wxID_ANY, label); - m_ip = new wxTextCtrl(window, wxID_ANY); - m_auto = new wxCheckBox(window, wxID_ANY, _("Auto")); - sizer->Add(label_box, wxGBPosition(col, 0), wxDefaultSpan, wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); - sizer->Add(m_ip, wxGBPosition(col, 1), wxDefaultSpan, wxEXPAND); - sizer->Add(m_auto, wxGBPosition(col, 2), wxDefaultSpan, wxEXPAND); - } - void setEnabled(bool enabled) - { - m_auto->Enable(enabled); - m_ip->Enable(enabled && !m_auto->GetValue()); - } - void load(const IP_Address& ip, bool is_auto) - { - IPControl_SetValue(m_ip, ip); - m_auto->SetValue(is_auto); - } - void save(IP_Address& ip, bool& is_auto) - { - ip = IPControl_GetValue(m_ip); - is_auto = m_auto->GetValue(); - } - }; - wxCheckBox* m_eth_enable; - wxChoice* m_eth_adapter_api; - wxChoice* m_eth_adapter; - std::vector m_api_list; - std::vector> m_adapter_list; - wxCheckBox* m_intercept_dhcp; - wxTextCtrl* m_ps2_address; - IPInputWithAutoCheck m_subnet_mask; - IPInputWithAutoCheck m_gateway_address; - IPInputWithAutoCheck m_dns1_address; - IPInputWithAutoCheck m_dns2_address; - - wxCheckBox* m_hdd_enable; - wxFilePickerCtrl* m_hdd_file; - wxSpinCtrl* m_hdd_size_spin; - wxSlider* m_hdd_size_slider; - - void addAdapter(const AdapterEntry& adapter) - { - if (std::find(m_api_list.begin(), m_api_list.end(), adapter.type) == m_api_list.end()) - m_api_list.push_back(adapter.type); - u32 idx = static_cast(adapter.type); - if (m_adapter_list.size() <= idx) - m_adapter_list.resize(idx + 1); - m_adapter_list[idx].push_back(adapter); - } - -public: - DEV9Dialog() - : wxDialog(nullptr, wxID_ANY, _("Network and HDD Settings"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER) - { - auto* padding = new wxBoxSizer(wxVERTICAL); - auto* top_box = new wxBoxSizer(wxVERTICAL); - - int space = wxSizerFlags().Border().GetBorderInPixels(); - int two_space = wxSizerFlags().DoubleBorder().GetBorderInPixels(); - - // Ethernet section - auto* eth_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Ethernet")); - - m_eth_enable = new wxCheckBox(this, wxID_ANY, _("Enabled")); - eth_sizer->Add(m_eth_enable); - eth_sizer->AddSpacer(space); - - auto* eth_adapter_box = new wxGridBagSizer(space, space); - for (const AdapterEntry& adapter : PCAPAdapter::GetAdapters()) - addAdapter(adapter); -#ifdef _WIN32 - for (const AdapterEntry& adapter : TAPAdapter::GetAdapters()) - addAdapter(adapter); -#endif - for (const AdapterEntry& adapter : SocketAdapter::GetAdapters()) - addAdapter(adapter); - - std::sort(m_api_list.begin(), m_api_list.end()); - for (auto& list : m_adapter_list) - std::sort(list.begin(), list.end(), [](const AdapterEntry& a, AdapterEntry& b){ return a.name < b.name; }); - wxArrayString adapter_api_name_list; - adapter_api_name_list.Add(""); - for (const Pcsx2Config::DEV9Options::NetApi& type : m_api_list) - adapter_api_name_list.Add(Pcsx2Config::DEV9Options::NetApiNames[(int)type]); - - auto* eth_adapter_api_label = new wxStaticText(this, wxID_ANY, _("Ethernet Device Type:")); - auto* eth_adapter_label = new wxStaticText(this, wxID_ANY, _("Ethernet Device:")); - auto* intercept_dhcp_label = new wxStaticText(this, wxID_ANY, _("Intercept DHCP:")); - auto* ps2_addr_label = new wxStaticText(this, wxID_ANY, _("PS2 Address:")); - m_eth_adapter_api = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, adapter_api_name_list); - m_eth_adapter = new wxChoice(this, wxID_ANY); - m_intercept_dhcp = new wxCheckBox(this, wxID_ANY, _("Enabled")); - m_ps2_address = new wxTextCtrl(this, wxID_ANY); - m_ps2_address->SetMinSize(wxSize(150, -1)); - - eth_adapter_box->Add(eth_adapter_api_label, wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); - eth_adapter_box->Add(eth_adapter_label, wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); - eth_adapter_box->Add(intercept_dhcp_label, wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); - eth_adapter_box->Add(ps2_addr_label, wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); - eth_adapter_box->Add(m_eth_adapter_api, wxGBPosition(0, 1), wxGBSpan(1, 2), wxEXPAND); - eth_adapter_box->Add(m_eth_adapter, wxGBPosition(1, 1), wxGBSpan(1, 2), wxEXPAND); - eth_adapter_box->Add(m_intercept_dhcp, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND); - eth_adapter_box->Add(m_ps2_address, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND); - - m_subnet_mask .create(4, this, eth_adapter_box, _("Subnet Mask:")); - m_gateway_address.create(5, this, eth_adapter_box, _("Gateway Address:")); - m_dns1_address .create(6, this, eth_adapter_box, _("DNS1 Address:")); - m_dns2_address .create(7, this, eth_adapter_box, _("DNS2 Address:")); - - eth_adapter_box->AddGrowableCol(2); - eth_sizer->Add(eth_adapter_box, wxSizerFlags().Expand()); - - // HDD section - auto* hdd_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Hard Disk Drive")); - - m_hdd_enable = new wxCheckBox(this, wxID_ANY, _("Enabled")); - - auto* hdd_file_label = new wxStaticText(this, wxID_ANY, _("HDD File")); - m_hdd_file = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, _("HDD image file"), "HDD|*.raw", wxDefaultPosition, wxDefaultSize, wxFLP_SAVE | wxFLP_USE_TEXTCTRL); - auto* hdd_size_label = new wxStaticText(this, wxID_ANY, _("HDD Size (GiB)")); - auto* hdd_size_box = new wxBoxSizer(wxHORIZONTAL); - m_hdd_size_slider = new wxSlider(this, wxID_ANY, HDD_MIN_GB, HDD_MIN_GB, HDD_MAX_GB, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_AUTOTICKS); - m_hdd_size_slider->SetPageSize(10); - m_hdd_size_slider->SetTickFreq(10); - m_hdd_size_spin = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, HDD_MIN_GB, HDD_MAX_GB, HDD_MIN_GB); - m_hdd_size_spin->SetSizeHints(m_hdd_size_spin->GetSizeFromTextSize(30)); - hdd_size_box->Add(m_hdd_size_slider, wxSizerFlags(1).Centre()); - hdd_size_box->AddSpacer(space); - hdd_size_box->Add(m_hdd_size_spin, wxSizerFlags(0).Centre()); - - hdd_sizer->Add(m_hdd_enable); - hdd_sizer->AddSpacer(two_space); - hdd_sizer->Add(hdd_file_label, wxSizerFlags().Left()); - hdd_sizer->AddSpacer(space); - hdd_sizer->Add(m_hdd_file, wxSizerFlags().Expand()); - hdd_sizer->AddSpacer(two_space); - hdd_sizer->Add(hdd_size_label, wxSizerFlags().Left()); - hdd_sizer->AddSpacer(space); - hdd_sizer->Add(hdd_size_box, wxSizerFlags().Expand()); - - top_box->Add(eth_sizer, wxSizerFlags().Expand()); - top_box->AddSpacer(space); - top_box->Add(hdd_sizer, wxSizerFlags().Expand()); - top_box->AddSpacer(space); - top_box->Add(CreateStdDialogButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Right()); - - padding->Add(top_box, wxSizerFlags().Expand().Border()); - SetSizerAndFit(padding); - SetMaxSize(wxSize(wxDefaultCoord, GetMinSize().y)); - - Bind(wxEVT_CHECKBOX, &DEV9Dialog::OnCheck, this); - Bind(wxEVT_SLIDER, &DEV9Dialog::OnSlide, this); - Bind(wxEVT_SPINCTRL, &DEV9Dialog::OnSpin, this); - Bind(wxEVT_CHOICE, &DEV9Dialog::OnChoice, this); - Bind(wxEVT_BUTTON, &DEV9Dialog::OnOK, this, wxID_OK); - } - - void Load(const Pcsx2Config::DEV9Options& config) - { - m_eth_enable->SetValue(config.EthEnable); - m_eth_adapter_api->SetSelection(0); - for (size_t i = 0; i < m_api_list.size(); i++) - { - if (config.EthApi == m_api_list[i]) - m_eth_adapter_api->SetSelection(i + 1); - } - UpdateAdapters(); - m_eth_adapter->SetSelection(0); - if (static_cast(config.EthApi) < m_adapter_list.size()) - { - const auto& list = m_adapter_list[static_cast(config.EthApi)]; - for (size_t i = 0; i < list.size(); i++) - { - if (list[i].guid == config.EthDevice) - { - m_eth_adapter->SetSelection(i + 1); - break; - } - } - } - m_intercept_dhcp->SetValue(config.InterceptDHCP); - IPControl_SetValue(m_ps2_address, *(IP_Address*)config.PS2IP); - m_subnet_mask .load(*(IP_Address*)config.Mask, config.AutoMask); - m_gateway_address.load(*(IP_Address*)config.Gateway, config.AutoGateway); - m_dns1_address .load(*(IP_Address*)config.DNS1, config.ModeDNS1 == Pcsx2Config::DEV9Options::DnsMode::Auto); - m_dns2_address .load(*(IP_Address*)config.DNS2, config.ModeDNS2 == Pcsx2Config::DEV9Options::DnsMode::Auto); - - m_hdd_enable->SetValue(config.HddEnable); - wxString wxHddFile = StringUtil::UTF8StringToWxString(config.HddFile); - m_hdd_file->SetInitialDirectory(wxHddFile); - m_hdd_file->SetPath(wxHddFile); - m_hdd_size_spin->SetValue((u64)config.HddSizeSectors * 512 / (1024 * 1024 * 1024)); - m_hdd_size_slider->SetValue((u64)config.HddSizeSectors * 512 / (1024 * 1024 * 1024)); - - UpdateEnable(); - } - - void Save(Pcsx2Config::DEV9Options& config) - { - config.EthEnable = m_eth_enable->GetValue(); - int api = m_eth_adapter_api->GetSelection(); - int eth = m_eth_adapter->GetSelection(); - if (api && eth) - { - const AdapterEntry& adapter = m_adapter_list[static_cast(m_api_list[api - 1])][eth - 1]; - config.EthDevice = adapter.guid; - config.EthApi = adapter.type; - } - else - { - config.EthDevice = ""; - config.EthApi = Pcsx2Config::DEV9Options::NetApi::Unset; - } - config.InterceptDHCP = m_intercept_dhcp->GetValue(); - *(IP_Address*)&config.PS2IP = IPControl_GetValue(m_ps2_address); - m_subnet_mask .save(*(IP_Address*)config.Mask, config.AutoMask); - m_gateway_address.save(*(IP_Address*)config.Gateway, config.AutoGateway); - - bool autoDNS1; - bool autoDNS2; - m_dns1_address.save(*(IP_Address*)config.DNS1, autoDNS1); - m_dns2_address.save(*(IP_Address*)config.DNS2, autoDNS2); - config.ModeDNS1 = autoDNS1 ? Pcsx2Config::DEV9Options::DnsMode::Auto : Pcsx2Config::DEV9Options::DnsMode::Manual; - config.ModeDNS2 = autoDNS2 ? Pcsx2Config::DEV9Options::DnsMode::Auto : Pcsx2Config::DEV9Options::DnsMode::Manual; - - config.HddEnable = m_hdd_enable->GetValue(); - config.HddFile = StringUtil::wxStringToUTF8String(m_hdd_file->GetPath()); - config.HddSizeSectors = (u64)m_hdd_size_spin->GetValue() * 1024 * 1024 * 1024 / 512; - } - - void UpdateEnable() - { - AdapterOptions adapterOptions = AdapterOptions::None; - const int api = m_eth_adapter_api->GetSelection(); - if (api) - { - const Pcsx2Config::DEV9Options::NetApi netApi = m_api_list[api - 1]; - switch (netApi) - { -#ifdef _WIN32 - case Pcsx2Config::DEV9Options::NetApi::TAP: - adapterOptions = TAPAdapter::GetAdapterOptions(); - break; -#endif - case Pcsx2Config::DEV9Options::NetApi::PCAP_Bridged: - case Pcsx2Config::DEV9Options::NetApi::PCAP_Switched: - adapterOptions = PCAPAdapter::GetAdapterOptions(); - break; - case Pcsx2Config::DEV9Options::NetApi::Sockets: - adapterOptions = SocketAdapter::GetAdapterOptions(); - break; - default: - break; - } - } - - bool eth_enable = m_eth_enable->GetValue(); - bool hdd_enable = m_hdd_enable->GetValue(); - bool dhcp_enable = eth_enable && (m_intercept_dhcp->GetValue() || ((adapterOptions & AdapterOptions::DHCP_ForcedOn) == AdapterOptions::DHCP_ForcedOn)); - - m_eth_adapter_api->Enable(eth_enable); - m_eth_adapter->Enable(eth_enable); - m_intercept_dhcp->Enable(eth_enable && ((adapterOptions & AdapterOptions::DHCP_ForcedOn) == AdapterOptions::None)); - m_ps2_address->Enable(dhcp_enable && ((adapterOptions & AdapterOptions::DHCP_OverrideIP) == AdapterOptions::None)); - m_subnet_mask.setEnabled(dhcp_enable && ((adapterOptions & AdapterOptions::DHCP_OverideSubnet) == AdapterOptions::None)); - m_gateway_address.setEnabled(dhcp_enable && ((adapterOptions & AdapterOptions::DHCP_OverideGateway) == AdapterOptions::None)); - m_dns1_address.setEnabled(dhcp_enable); - m_dns2_address.setEnabled(dhcp_enable); - m_hdd_file->Enable(hdd_enable); - m_hdd_size_spin->Enable(hdd_enable); - m_hdd_size_slider->Enable(hdd_enable); - } - - void UpdateAdapters() - { - int api = m_eth_adapter_api->GetSelection(); - int selection = 0; - wxArrayString options; - options.Add(""); - if (api) - { - const auto& list = m_adapter_list[static_cast(m_api_list[api - 1])]; - wxString current; - if (m_eth_adapter->GetCount()) - current = m_eth_adapter->GetString(m_eth_adapter->GetSelection()); - if (current.empty()) - current = StringUtil::UTF8StringToWxString(g_Conf->EmuOptions.DEV9.EthDevice); - for (size_t i = 0; i < list.size(); i++) - { - wxString wxAdapterName = StringUtil::UTF8StringToWxString(list[i].name); - options.Add(wxAdapterName); - if (wxAdapterName == current) - selection = i + 1; - } - } - m_eth_adapter->Set(options); - m_eth_adapter->SetSelection(selection); - // Update minimum sizes for the possibly increased dropdown size - // Nothing else seems to update the minimum size of the window - SetSizerAndFit(GetSizer(), false); - } - - void OnCheck(wxCommandEvent&) - { - UpdateEnable(); - } - - void OnSlide(wxCommandEvent&) - { - m_hdd_size_spin->SetValue(m_hdd_size_slider->GetValue()); - } - - void OnSpin(wxCommandEvent&) - { - m_hdd_size_slider->SetValue(m_hdd_size_spin->GetValue()); - } - - void OnChoice(wxCommandEvent& ev) - { - if (ev.GetEventObject() == m_eth_adapter_api) - { - UpdateAdapters(); - UpdateEnable(); - } - } - - void OnOK(wxCommandEvent& ev) - { - const wxChar* msg = nullptr; - - if (m_eth_enable->GetValue() && !m_eth_adapter->GetSelection()) - msg = _("Please select an ethernet adapter or disable ethernet"); - if (m_hdd_enable->GetValue() && m_hdd_file->GetPath().empty()) - msg = _("Please specify a HDD file or disable the hard drive"); - - if (msg) - wxMessageDialog(this, msg).ShowModal(); - else - ev.Skip(); - } -}; - -void DEV9configure() -{ - ScopedCoreThreadPause paused_core; - - DEV9Dialog dialog; - dialog.Load(g_Conf->EmuOptions.DEV9); - if (dialog.ShowModal() == wxID_OK) - { - dialog.Save(g_Conf->EmuOptions.DEV9); - - std::string hddPath(g_Conf->EmuOptions.DEV9.HddFile); - - if (!Path::IsAbsolute(hddPath)) - hddPath = Path::Combine(EmuFolders::Settings, hddPath); - - if (g_Conf->EmuOptions.DEV9.HddEnable && !FileSystem::FileExists(hddPath.c_str())) - { - HddCreateWx hddCreator; - hddCreator.filePath = hddPath; - hddCreator.neededSize = ((u64)g_Conf->EmuOptions.DEV9.HddSizeSectors) * 512; - hddCreator.Start(); - } - - AppSaveSettings(); - } - - paused_core.AllowResume(); -} diff --git a/pcsx2/DEV9/DEV9Config.cpp b/pcsx2/DEV9/DEV9Config.cpp deleted file mode 100644 index 5cf511177c..0000000000 --- a/pcsx2/DEV9/DEV9Config.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "common/StringUtil.h" -#include - -#include "DEV9.h" - -#ifndef PCSX2_CORE -#include "gui/AppConfig.h" -#include "gui/IniInterface.h" -#endif - -#ifdef _WIN32 -#include "ws2tcpip.h" -#elif defined(__POSIX__) -#include -#endif - -#if defined(__FreeBSD__) -#include -#endif - -void SaveDnsHosts() -{ -#ifndef PCSX2_CORE - std::unique_ptr hini(OpenFileConfig(StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "DEV9Hosts.ini")))); -#else - std::unique_ptr hini(new wxFileConfig(wxEmptyString, wxEmptyString, EmuFolders::Settings.Combine(wxString("DEV9Hosts.ini")).GetFullPath(), wxEmptyString, wxCONFIG_USE_RELATIVE_PATH)); -#endif - IniSaver ini((wxConfigBase*)hini.get()); - - for (size_t i = 0; i < config.EthHosts.size(); i++) - { - std::wstring groupName(L"Host" + std::to_wstring(i)); - ScopedIniGroup iniEntry(ini, groupName); - ConfigHost entry = config.EthHosts[i]; - - wxString url(fromUTF8(entry.Url)); - ini.Entry(L"Url", url); - //TODO UTF8(?) - wxString desc(fromUTF8(entry.Desc)); - ini.Entry(L"Desc", desc); - - char addrBuff[INET_ADDRSTRLEN]; - inet_ntop(AF_INET, entry.Address, addrBuff, INET_ADDRSTRLEN); - wxString address(addrBuff); - ini.Entry(L"Address", address); - - ini.Entry(L"Enabled", entry.Enabled); - } - ini.Flush(); -} - -void LoadDnsHosts() -{ - wxFileName iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "DEV9Hosts.ini")); - config.EthHosts.clear(); - //If no file exists, create one to provide an example config - if (!iniPath.FileExists()) - { - //Load Default settings - ConfigHost exampleHost; - exampleHost.Url = "www.example.com"; - exampleHost.Desc = "Set DNS to 192.0.2.1 to use this host list"; - memset(exampleHost.Address, 0, 4); - exampleHost.Enabled = false; - config.EthHosts.push_back(exampleHost); - SaveDnsHosts(); - return; - } - -#ifndef PCSX2_CORE - std::unique_ptr hini(OpenFileConfig(iniPath.GetFullPath())); -#else - std::unique_ptr hini(new wxFileConfig(wxEmptyString, wxEmptyString, iniPath.GetFullPath(), wxEmptyString, wxCONFIG_USE_RELATIVE_PATH)); -#endif - IniLoader ini((wxConfigBase*)hini.get()); - - int i = 0; - while (true) - { - std::wstring groupName(L"Host" + std::to_wstring(i)); - ScopedIniGroup iniEntry(ini, groupName); - wxString tmp = wxEmptyString; - ini.Entry(L"Url", tmp, wxEmptyString); - //An empty url means we tried to read beyond end of the host list - if (tmp.IsEmpty()) - break; - - ConfigHost entry; - entry.Url = tmp.ToUTF8(); - - ini.Entry(L"Desc", tmp, wxEmptyString); - entry.Desc = tmp.ToUTF8(); - - ini.Entry(L"Address", tmp, L"0.0.0.0"); - - int ret = inet_pton(AF_INET, tmp.ToUTF8(), entry.Address); - //Only check Enabled if valid ip - if (ret != 1) - { - memset(entry.Address, 0, 4); - entry.Enabled = false; - } - else - ini.Entry(L"Enabled", entry.Enabled, false); - - if (EmuConfig.DEV9.EthLogDNS && entry.Enabled) - Console.WriteLn("DEV9: Host entry %i: url %s mapped to %s", i, entry.Url.c_str(), tmp.ToStdString().c_str()); - - config.EthHosts.push_back(entry); - i++; - } -} diff --git a/pcsx2/DEV9/DEV9Config.h b/pcsx2/DEV9/DEV9Config.h deleted file mode 100644 index 041bceea70..0000000000 --- a/pcsx2/DEV9/DEV9Config.h +++ /dev/null @@ -1,17 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -void SaveDnsHosts(); -void LoadDnsHosts(); diff --git a/pcsx2/Darwin/DarwinKeyCodes.cpp b/pcsx2/Darwin/DarwinKeyCodes.cpp deleted file mode 100644 index 1e585fddc9..0000000000 --- a/pcsx2/Darwin/DarwinKeyCodes.cpp +++ /dev/null @@ -1,142 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2022 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include - -int TranslateOSXtoWXK(u32 keysym) -{ - switch (keysym) - { - case kVK_ANSI_A: return 'A'; - case kVK_ANSI_S: return 'S'; - case kVK_ANSI_D: return 'D'; - case kVK_ANSI_F: return 'F'; - case kVK_ANSI_H: return 'H'; - case kVK_ANSI_G: return 'G'; - case kVK_ANSI_Z: return 'Z'; - case kVK_ANSI_X: return 'X'; - case kVK_ANSI_C: return 'C'; - case kVK_ANSI_V: return 'V'; - case kVK_ANSI_B: return 'B'; - case kVK_ANSI_Q: return 'Q'; - case kVK_ANSI_W: return 'W'; - case kVK_ANSI_E: return 'E'; - case kVK_ANSI_R: return 'R'; - case kVK_ANSI_Y: return 'Y'; - case kVK_ANSI_T: return 'T'; - case kVK_ANSI_1: return '1'; - case kVK_ANSI_2: return '2'; - case kVK_ANSI_3: return '3'; - case kVK_ANSI_4: return '4'; - case kVK_ANSI_6: return '6'; - case kVK_ANSI_5: return '5'; - case kVK_ANSI_Equal: return '='; - case kVK_ANSI_9: return '9'; - case kVK_ANSI_7: return '7'; - case kVK_ANSI_Minus: return '-'; - case kVK_ANSI_8: return '8'; - case kVK_ANSI_0: return '0'; - case kVK_ANSI_RightBracket: return ']'; - case kVK_ANSI_O: return 'O'; - case kVK_ANSI_U: return 'U'; - case kVK_ANSI_LeftBracket: return '['; - case kVK_ANSI_I: return 'I'; - case kVK_ANSI_P: return 'P'; - case kVK_ANSI_L: return 'L'; - case kVK_ANSI_J: return 'J'; - case kVK_ANSI_Quote: return '\''; - case kVK_ANSI_K: return 'K'; - case kVK_ANSI_Semicolon: return ';'; - case kVK_ANSI_Backslash: return '\\'; - case kVK_ANSI_Comma: return ','; - case kVK_ANSI_Slash: return '/'; - case kVK_ANSI_N: return 'N'; - case kVK_ANSI_M: return 'M'; - case kVK_ANSI_Period: return '.'; - case kVK_ANSI_Grave: return '`'; - case kVK_ANSI_KeypadDecimal: return WXK_NUMPAD_DECIMAL; - case kVK_ANSI_KeypadMultiply: return WXK_NUMPAD_MULTIPLY; - case kVK_ANSI_KeypadPlus: return WXK_NUMPAD_ADD; - case kVK_ANSI_KeypadClear: return WXK_CLEAR; - case kVK_ANSI_KeypadDivide: return WXK_NUMPAD_DIVIDE; - case kVK_ANSI_KeypadEnter: return WXK_NUMPAD_ENTER; - case kVK_ANSI_KeypadMinus: return WXK_NUMPAD_SUBTRACT; - case kVK_ANSI_KeypadEquals: return WXK_NUMPAD_EQUAL; - case kVK_ANSI_Keypad0: return WXK_NUMPAD0; - case kVK_ANSI_Keypad1: return WXK_NUMPAD1; - case kVK_ANSI_Keypad2: return WXK_NUMPAD2; - case kVK_ANSI_Keypad3: return WXK_NUMPAD3; - case kVK_ANSI_Keypad4: return WXK_NUMPAD4; - case kVK_ANSI_Keypad5: return WXK_NUMPAD5; - case kVK_ANSI_Keypad6: return WXK_NUMPAD6; - case kVK_ANSI_Keypad7: return WXK_NUMPAD7; - case kVK_ANSI_Keypad8: return WXK_NUMPAD8; - case kVK_ANSI_Keypad9: return WXK_NUMPAD9; - - case kVK_Return: return WXK_RETURN; - case kVK_Tab: return WXK_TAB; - case kVK_Space: return WXK_SPACE; - case kVK_Delete: return WXK_BACK; - case kVK_Escape: return WXK_ESCAPE; - case kVK_Command: return WXK_COMMAND; - case kVK_Shift: return WXK_SHIFT; - case kVK_CapsLock: return WXK_CAPITAL; - case kVK_Option: return WXK_ALT; - case kVK_Control: return WXK_RAW_CONTROL; - case kVK_RightCommand: return WXK_COMMAND; - case kVK_RightShift: return WXK_SHIFT; - case kVK_RightOption: return WXK_ALT; - case kVK_RightControl: return WXK_RAW_CONTROL; - case kVK_Function: return 0; - case kVK_F17: return WXK_F17; -#if wxCHECK_VERSION(3, 1, 0) - case kVK_VolumeUp: return WXK_VOLUME_UP; - case kVK_VolumeDown: return WXK_VOLUME_DOWN; - case kVK_Mute: return WXK_VOLUME_MUTE; -#endif - case kVK_F18: return WXK_F18; - case kVK_F19: return WXK_F19; - case kVK_F20: return WXK_F20; - case kVK_F5: return WXK_F5; - case kVK_F6: return WXK_F6; - case kVK_F7: return WXK_F7; - case kVK_F3: return WXK_F3; - case kVK_F8: return WXK_F8; - case kVK_F9: return WXK_F9; - case kVK_F11: return WXK_F11; - case kVK_F13: return WXK_F13; - case kVK_F16: return WXK_F16; - case kVK_F14: return WXK_F14; - case kVK_F10: return WXK_F10; - case kVK_F12: return WXK_F12; - case kVK_F15: return WXK_F15; - case kVK_Help: return WXK_HELP; - case kVK_Home: return WXK_HOME; - case kVK_PageUp: return WXK_PAGEUP; - case kVK_ForwardDelete: return WXK_DELETE; - case kVK_F4: return WXK_F4; - case kVK_End: return WXK_END; - case kVK_F2: return WXK_F2; - case kVK_PageDown: return WXK_PAGEDOWN; - case kVK_F1: return WXK_F1; - case kVK_LeftArrow: return WXK_LEFT; - case kVK_RightArrow: return WXK_RIGHT; - case kVK_DownArrow: return WXK_DOWN; - case kVK_UpArrow: return WXK_UP; - default: - return 0; - } -} diff --git a/pcsx2/GS/Window/GSwxDialog.cpp b/pcsx2/GS/Window/GSwxDialog.cpp deleted file mode 100644 index f5ebba2669..0000000000 --- a/pcsx2/GS/Window/GSwxDialog.cpp +++ /dev/null @@ -1,844 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "GSwxDialog.h" -#include "gui/AppConfig.h" -#include "gui/StringHelpers.h" -#include "GS/GSUtil.h" -#include "HostDisplay.h" - -#ifdef _WIN32 -#include "Frontend/D3D11HostDisplay.h" -#include "Frontend/D3D12HostDisplay.h" -#endif -#include "GS/Renderers/Metal/GSMetalCPPAccessible.h" - -#ifdef ENABLE_VULKAN -#include "Frontend/VulkanHostDisplay.h" -#endif - -using namespace GSSettingsDialog; - -namespace -{ - void add_tooltip(wxWindow* widget, int tooltip) - { - if (tooltip != -1) - widget->SetToolTip(dialog_message(tooltip)); - } - - void add_settings_to_array_string(const std::vector& s, wxArrayString& arr) - { - for (const GSSetting& setting : s) - { - if (!setting.note.empty()) - arr.Add(fromUTF8(setting.name + " (" + setting.note + ")")); - else - arr.Add(fromUTF8(setting.name)); - } - } - - size_t get_config_index(const std::vector& s, int value) - { - for (size_t i = 0; i < s.size(); i++) - { - if (s[i].value == value) - return i; - } - return 0; - } - - void set_config_from_choice(const wxChoice* choice, const std::vector& s, const char* str) - { - int idx = choice->GetSelection(); - - if (idx == wxNOT_FOUND) - return; - - theApp.SetConfig(str, s[idx].value); - } - - void add_label(wxWindow* parent, wxSizer* sizer, const char* str, int tooltip = -1, wxSizerFlags flags = wxSizerFlags().Centre().Right(), long style = wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL) - { - auto* temp_text = new wxStaticText(parent, wxID_ANY, str, wxDefaultPosition, wxDefaultSize, style); - add_tooltip(temp_text, tooltip); - sizer->Add(temp_text, flags); - } - - /// wxBoxSizer with padding - template - struct PaddedBoxSizer - { - OuterSizer* outer; - wxBoxSizer* inner; - - // Make static analyzers happy (memory management is handled by WX) - // (There's no actual reason we couldn't use the default copy constructor, except cppcheck screams when you do and it's easier to delete than implement one) - PaddedBoxSizer(const PaddedBoxSizer&) = delete; - - template - PaddedBoxSizer(wxOrientation orientation, Args&&... args) - : outer(new OuterSizer(orientation, std::forward(args)...)) - , inner(new wxBoxSizer(orientation)) - { - wxSizerFlags flags = wxSizerFlags().Expand(); -#ifdef __APPLE__ - if (!std::is_same::value) // wxMac already adds padding to static box sizers -#endif - flags.Border(); - outer->Add(inner, flags); - } - - wxBoxSizer* operator->() { return inner; } - }; - - struct CheckboxPrereq - { - wxCheckBox* box; - explicit CheckboxPrereq(wxCheckBox* box) - : box(box) - { - } - - bool operator()() - { - return box->GetValue(); - } - }; -} // namespace - -GSUIElementHolder::GSUIElementHolder(wxWindow* window) - : m_window(window) -{ -} - -wxStaticText* GSUIElementHolder::addWithLabel(wxControl* control, UIElem::Type type, wxSizer* sizer, const char* label, const char* config_name, int tooltip, std::function prereq, wxSizerFlags flags) -{ - add_tooltip(control, tooltip); - wxStaticText* text = new wxStaticText(m_window, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT); - add_tooltip(text, tooltip); - sizer->Add(text, wxSizerFlags().Centre().Right()); - sizer->Add(control, flags); - m_elems.emplace_back(type, control, config_name, prereq); - return text; -} - -wxCheckBox* GSUIElementHolder::addCheckBox(wxSizer* sizer, const char* label, const char* config_name, int tooltip, std::function prereq) -{ - wxCheckBox* box = new wxCheckBox(m_window, wxID_ANY, label); - add_tooltip(box, tooltip); - if (sizer) - sizer->Add(box); - m_elems.emplace_back(UIElem::Type::CheckBox, box, config_name, prereq); - return box; -} - -std::pair GSUIElementHolder::addComboBoxAndLabel(wxSizer* sizer, const char* label, const char* config_name, const std::vector* settings, int tooltip, std::function prereq) -{ - wxArrayString temp; - add_settings_to_array_string(*settings, temp); - wxChoice* choice = new GSwxChoice(m_window, wxID_ANY, wxDefaultPosition, wxDefaultSize, temp, settings); - return std::make_pair(choice, addWithLabel(choice, UIElem::Type::Choice, sizer, label, config_name, tooltip, prereq)); -} - -wxSpinCtrl* GSUIElementHolder::addSpin(wxSizer* sizer, const char* config_name, int min, int max, int initial, int tooltip, std::function prereq) -{ - wxSpinCtrl* spin = new wxSpinCtrl(m_window, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, initial); - add_tooltip(spin, tooltip); - if (sizer) - sizer->Add(spin, wxSizerFlags(1)); - m_elems.emplace_back(UIElem::Type::Spin, spin, config_name, prereq); - return spin; -} - -std::pair GSUIElementHolder::addSpinAndLabel(wxSizer* sizer, const char* label, const char* config_name, int min, int max, int initial, int tooltip, std::function prereq) -{ - wxSpinCtrl* spin = new wxSpinCtrl(m_window, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, initial); - return std::make_pair(spin, addWithLabel(spin, UIElem::Type::Spin, sizer, label, config_name, tooltip, prereq, wxSizerFlags().Centre().Left().Expand())); -} - -std::pair GSUIElementHolder::addSliderAndLabel(wxSizer* sizer, const char* label, const char* config_name, int min, int max, int initial, int tooltip, std::function prereq) -{ - wxSlider* slider = new wxSlider(m_window, wxID_ANY, initial, min, max, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_VALUE_LABEL); - return std::make_pair(slider, addWithLabel(slider, UIElem::Type::Slider, sizer, label, config_name, tooltip, prereq)); -} - -std::pair GSUIElementHolder::addFilePickerAndLabel(wxSizer* sizer, const char* label, const char* config_name, int tooltip, std::function prereq) -{ - wxFilePickerCtrl* picker = new wxFilePickerCtrl(m_window, wxID_ANY); - return std::make_pair(picker, addWithLabel(picker, UIElem::Type::File, sizer, label, config_name, tooltip, prereq)); -} - -std::pair GSUIElementHolder::addDirPickerAndLabel(wxSizer* sizer, const char* label, const char* config_name, int tooltip, std::function prereq) -{ - wxDirPickerCtrl* picker = new wxDirPickerCtrl(m_window, wxID_ANY); - return std::make_pair(picker, addWithLabel(picker, UIElem::Type::Directory, sizer, label, config_name, tooltip, prereq)); -} - -void GSUIElementHolder::Load() -{ - for (const UIElem& elem : m_elems) - { - switch (elem.type) - { - case UIElem::Type::CheckBox: - static_cast(elem.control)->SetValue(theApp.GetConfigB(elem.config)); - break; - case UIElem::Type::Choice: - { - GSwxChoice* choice = static_cast(elem.control); - choice->SetSelection(get_config_index(choice->settings, theApp.GetConfigI(elem.config))); - break; - } - case UIElem::Type::Spin: - static_cast(elem.control)->SetValue(theApp.GetConfigI(elem.config)); - break; - case UIElem::Type::Slider: - static_cast(elem.control)->SetValue(theApp.GetConfigI(elem.config)); - break; - case UIElem::Type::File: - case UIElem::Type::Directory: - { - auto* picker = static_cast(elem.control); - picker->SetInitialDirectory(fromUTF8(theApp.GetConfigS(elem.config))); - picker->SetPath(fromUTF8(theApp.GetConfigS(elem.config))); - break; - } - } - } -} - -void GSUIElementHolder::Save() -{ - for (const UIElem& elem : m_elems) - { - switch (elem.type) - { - case UIElem::Type::CheckBox: - theApp.SetConfig(elem.config, static_cast(elem.control)->GetValue()); - break; - case UIElem::Type::Choice: - { - GSwxChoice* choice = static_cast(elem.control); - set_config_from_choice(choice, choice->settings, elem.config); - break; - } - case UIElem::Type::Spin: - theApp.SetConfig(elem.config, static_cast(elem.control)->GetValue()); - break; - case UIElem::Type::Slider: - theApp.SetConfig(elem.config, static_cast(elem.control)->GetValue()); - break; - case UIElem::Type::File: - case UIElem::Type::Directory: - theApp.SetConfig(elem.config, static_cast(elem.control)->GetPath().ToUTF8()); - break; - } - } -} - -void GSUIElementHolder::Update() -{ - for (const UIElem& elem : m_elems) - { - if (elem.prereq) - elem.control->Enable(elem.prereq()); - } -} - -void GSUIElementHolder::DisableAll() -{ - for (const UIElem& elem : m_elems) - { - if (elem.prereq) - elem.control->Enable(false); - } -} - -RendererTab::RendererTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) - , m_ui(this) -{ - const int space = wxSizerFlags().Border().GetBorderInPixels(); - auto hw_prereq = [this]{ return m_is_hardware; }; - auto sw_prereq = [this]{ return !m_is_hardware; }; - - PaddedBoxSizer tab_box(wxVERTICAL); - PaddedBoxSizer general_box(wxVERTICAL, this, "General GS Settings"); - PaddedBoxSizer hardware_box(wxVERTICAL, this, "Hardware Mode"); - PaddedBoxSizer software_box(wxVERTICAL, this, "Software Mode"); - - auto* hw_checks_box = new wxWrapSizer(wxHORIZONTAL); - - auto* paltex_prereq = m_ui.addCheckBox(hw_checks_box, "GPU Palette Conversion", "paltex", IDC_PALTEX, hw_prereq); - m_ui.addCheckBox(hw_checks_box, "Spin GPU During Readbacks", "HWSpinGPUForReadbacks", IDC_SPIN_GPU); - m_ui.addCheckBox(hw_checks_box, "Spin CPU During Readbacks", "HWSpinCPUForReadbacks", IDC_SPIN_CPU); - auto aniso_prereq = [this, paltex_prereq]{ return m_is_hardware && paltex_prereq->GetValue() == false; }; - - auto* hw_choice_grid = new wxFlexGridSizer(2, space, space); - - m_internal_resolution = m_ui.addComboBoxAndLabel(hw_choice_grid, "Internal Resolution:", "upscale_multiplier", &theApp.m_gs_upscale_multiplier, -1, hw_prereq).first; - - m_ui.addComboBoxAndLabel(hw_choice_grid, "Anisotropic Filtering:", "MaxAnisotropy", &theApp.m_gs_max_anisotropy, IDC_AFCOMBO, aniso_prereq); - m_ui.addComboBoxAndLabel(hw_choice_grid, "Dithering (PgDn):", "dithering_ps2", &theApp.m_gs_dithering, IDC_DITHERING, hw_prereq); - m_ui.addComboBoxAndLabel(hw_choice_grid, "Mipmapping:", "mipmap_hw", &theApp.m_gs_hw_mipmapping, IDC_MIPMAP_HW, hw_prereq); - m_ui.addComboBoxAndLabel(hw_choice_grid, "Trilinear Filtering:", "TriFilter", &theApp.m_gs_trifilter, IDC_TRI_FILTER, hw_prereq); - m_ui.addComboBoxAndLabel(hw_choice_grid, "CRC Hack Level:", "crc_hack_level", &theApp.m_gs_crc_level, IDC_CRC_LEVEL, hw_prereq); - m_ui.addComboBoxAndLabel(hw_choice_grid, "Blending Accuracy:", "accurate_blending_unit", &theApp.m_gs_acc_blend_level, IDC_ACCURATE_BLEND_UNIT, hw_prereq); - m_ui.addComboBoxAndLabel(hw_choice_grid, "Texture Preloading:", "texture_preloading", &theApp.m_gs_texture_preloading, IDC_PRELOAD_TEXTURES, hw_prereq); - - hardware_box->Add(hw_checks_box, wxSizerFlags().Centre()); - hardware_box->AddSpacer(space); - hardware_box->Add(hw_choice_grid, wxSizerFlags().Centre()); - - auto* sw_checks_box = new wxWrapSizer(wxHORIZONTAL); - m_ui.addCheckBox(sw_checks_box, "Auto Flush", "autoflush_sw", IDC_AUTO_FLUSH_SW, sw_prereq); - m_ui.addCheckBox(sw_checks_box, "Mipmapping", "mipmap", IDC_MIPMAP_SW, sw_prereq); - - software_box->Add(sw_checks_box, wxSizerFlags().Centre()); - software_box->AddSpacer(space); - - // Rendering threads - auto* thread_box = new wxFlexGridSizer(2, space, space); - m_ui.addSpinAndLabel(thread_box, "Extra Rendering threads:", "extrathreads", 0, 32, 2, IDC_SWTHREADS, sw_prereq); - software_box->Add(thread_box, wxSizerFlags().Centre()); - - // General GS Settings box - auto* pcrtc_checks_box = new wxWrapSizer(wxHORIZONTAL); - - m_ui.addCheckBox(pcrtc_checks_box, "Screen Offsets", "pcrtc_offsets", IDC_PCRTC_OFFSETS); - m_ui.addCheckBox(pcrtc_checks_box, "Show Overscan", "pcrtc_overscan", IDC_PCRTC_OVERSCAN); - m_ui.addCheckBox(pcrtc_checks_box, "Disable Interlace Offset", "disable_interlace_offset", IDC_DISABLE_INTERLACE_OFFSETS); - m_ui.addCheckBox(pcrtc_checks_box, "Anti-Blur", "pcrtc_antiblur", IDC_PCRTC_ANTIBLUR); - general_box->Add(pcrtc_checks_box, wxSizerFlags().Center()); - - tab_box->Add(hardware_box.outer, wxSizerFlags().Expand()); - tab_box->Add(software_box.outer, wxSizerFlags().Expand()); - tab_box->Add(general_box.outer, wxSizerFlags().Expand()); - - SetSizerAndFit(tab_box.outer); -} - -HacksTab::HacksTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) - , m_ui(this) -{ - const int space = wxSizerFlags().Border().GetBorderInPixels(); - PaddedBoxSizer tab_box(wxVERTICAL); - - auto hw_prereq = [this]{ return m_is_hardware; }; - auto* hacks_check_box = m_ui.addCheckBox(tab_box.inner, "Manual HW Hacks (Disables automatic settings if checked)", "UserHacks", -1, hw_prereq); - m_ui.addCheckBox(tab_box.inner, "Skip Presenting Duplicate Frames", "SkipDuplicateFrames", -1); - - auto hacks_prereq = [this, hacks_check_box]{ return m_is_hardware && hacks_check_box->GetValue(); }; - auto upscale_hacks_prereq = [this, hacks_check_box]{ return !m_is_native_res && hacks_check_box->GetValue(); }; - - PaddedBoxSizer rend_hacks_box (wxVERTICAL, this, "Renderer Hacks"); - PaddedBoxSizer upscale_hacks_box(wxVERTICAL, this, "Upscale Hacks"); - - auto* rend_hacks_grid = new wxFlexGridSizer(2, space, space); - auto* upscale_hacks_grid = new wxFlexGridSizer(3, space, space); - - // Renderer Hacks - m_ui.addCheckBox(rend_hacks_grid, "Auto Flush", "UserHacks_AutoFlush", IDC_AUTO_FLUSH_HW, hacks_prereq); - m_ui.addCheckBox(rend_hacks_grid, "Frame Buffer Conversion", "UserHacks_CPU_FB_Conversion", IDC_CPU_FB_CONVERSION, hacks_prereq); - m_ui.addCheckBox(rend_hacks_grid, "Disable Depth Emulation", "UserHacks_DisableDepthSupport", IDC_TC_DEPTH, hacks_prereq); - m_ui.addCheckBox(rend_hacks_grid, "Disable Safe Features", "UserHacks_Disable_Safe_Features", IDC_SAFE_FEATURES, hacks_prereq); - m_ui.addCheckBox(rend_hacks_grid, "Preload Frame Data", "preload_frame_with_gs_data", IDC_PRELOAD_GS, hacks_prereq); - m_ui.addCheckBox(rend_hacks_grid, "Disable Partial Invalidation", "UserHacks_DisablePartialInvalidation", IDC_DISABLE_PARTIAL_TC_INV, hacks_prereq); - m_ui.addCheckBox(rend_hacks_grid, "Texture Inside RT", "UserHacks_TextureInsideRt", IDC_TEX_IN_RT, hacks_prereq); - - // Upscale - m_ui.addCheckBox(upscale_hacks_grid, "Align Sprite", "UserHacks_align_sprite_X", IDC_ALIGN_SPRITE, upscale_hacks_prereq); - m_ui.addCheckBox(upscale_hacks_grid, "Merge Sprite", "UserHacks_merge_pp_sprite", IDC_MERGE_PP_SPRITE, upscale_hacks_prereq); - m_ui.addCheckBox(upscale_hacks_grid, "Wild Arms Hack", "UserHacks_WildHack", IDC_WILDHACK, upscale_hacks_prereq); - - auto* rend_hack_choice_grid = new wxFlexGridSizer(2, space, space); - auto* upscale_hack_choice_grid = new wxFlexGridSizer(2, space, space); - rend_hack_choice_grid ->AddGrowableCol(1); - upscale_hack_choice_grid->AddGrowableCol(1); - - // Renderer Hacks: - m_ui.addComboBoxAndLabel(rend_hack_choice_grid, "Half Screen Fix:", "UserHacks_Half_Bottom_Override", &theApp.m_gs_generic_list, IDC_HALF_SCREEN_TS, hacks_prereq); - - // Skipdraw Range - add_label(this, rend_hack_choice_grid, "Skipdraw Range:", IDC_SKIPDRAWEND); - auto* skip_box = new wxBoxSizer(wxHORIZONTAL); - skip_x_spin = m_ui.addSpin(skip_box, "UserHacks_SkipDraw_Start", 0, 10000, 0, IDC_SKIPDRAWSTART, hacks_prereq); - skip_y_spin = m_ui.addSpin(skip_box, "UserHacks_SkipDraw_End", 0, 10000, 0, IDC_SKIPDRAWEND, hacks_prereq); - - rend_hack_choice_grid->Add(skip_box, wxSizerFlags().Expand()); - - // Upscale Hacks: - m_ui.addComboBoxAndLabel(upscale_hack_choice_grid, "Half-Pixel Offset:", "UserHacks_HalfPixelOffset", &theApp.m_gs_offset_hack, IDC_OFFSETHACK, upscale_hacks_prereq); - m_ui.addComboBoxAndLabel(upscale_hack_choice_grid, "Round Sprite:", "UserHacks_round_sprite_offset", &theApp.m_gs_hack, IDC_ROUND_SPRITE, upscale_hacks_prereq); - - // Texture Offsets - add_label(this, upscale_hack_choice_grid, "Texture Offsets:", IDC_TCOFFSETX); - auto* tex_off_box = new wxBoxSizer(wxHORIZONTAL); - add_label(this, tex_off_box, "X:", IDC_TCOFFSETX, wxSizerFlags().Centre()); - tex_off_box->AddSpacer(space); - m_ui.addSpin(tex_off_box, "UserHacks_TCOffsetX", 0, 10000, 0, IDC_TCOFFSETX, upscale_hacks_prereq); - tex_off_box->AddSpacer(space); - add_label(this, tex_off_box, "Y:", IDC_TCOFFSETY, wxSizerFlags().Centre()); - tex_off_box->AddSpacer(space); - m_ui.addSpin(tex_off_box, "UserHacks_TCOffsetY", 0, 10000, 0, IDC_TCOFFSETY, upscale_hacks_prereq); - - upscale_hack_choice_grid->Add(tex_off_box, wxSizerFlags().Expand()); - - rend_hacks_box->Add(rend_hacks_grid, wxSizerFlags().Centre()); - rend_hacks_box->AddSpacer(space); - rend_hacks_box->Add(rend_hack_choice_grid, wxSizerFlags().Expand()); - - upscale_hacks_box->Add(upscale_hacks_grid, wxSizerFlags().Centre()); - upscale_hacks_box->AddSpacer(space); - upscale_hacks_box->Add(upscale_hack_choice_grid, wxSizerFlags().Expand()); - - tab_box->Add(rend_hacks_box.outer, wxSizerFlags().Expand()); - tab_box->Add(upscale_hacks_box.outer, wxSizerFlags().Expand()); - - SetSizerAndFit(tab_box.outer); -} - -void HacksTab::DoUpdate() -{ - m_ui.Update(); - - if (skip_x_spin->GetValue() == 0) - skip_y_spin->SetValue(0); - if (skip_y_spin->GetValue() < skip_x_spin->GetValue()) - skip_y_spin->SetValue(skip_x_spin->GetValue()); -} - -RecTab::RecTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) - , m_ui(this) -{ - const int space = wxSizerFlags().Border().GetBorderInPixels(); - PaddedBoxSizer tab_box(wxVERTICAL); - - auto* record_check = m_ui.addCheckBox(tab_box.inner, "Enable Recording (F12)", "capture_enabled"); - CheckboxPrereq record_prereq(record_check); - PaddedBoxSizer record_box(wxVERTICAL, this, "Recording"); - auto* record_grid_box = new wxFlexGridSizer(2, space, space); - record_grid_box->AddGrowableCol(1); - - // Resolution - add_label(this, record_grid_box, "Resolution:"); - auto* res_box = new wxBoxSizer(wxHORIZONTAL); - m_ui.addSpin(res_box, "CaptureWidth", 256, 8192, 640, -1, record_prereq); - m_ui.addSpin(res_box, "CaptureHeight", 256, 8192, 480, -1, record_prereq); - - record_grid_box->Add(res_box, wxSizerFlags().Expand()); - - m_ui.addSpinAndLabel(record_grid_box, "Saving Threads:", "capture_threads", 1, 32, 4, -1, record_prereq); - m_ui.addSpinAndLabel(record_grid_box, "PNG Compression Level:", "png_compression_level", 1, 9, 1, -1, record_prereq); - - m_ui.addDirPickerAndLabel(record_grid_box, "Output Directory:", "capture_out_dir", -1, record_prereq); - - record_box->Add(record_grid_box, wxSizerFlags().Expand()); - - tab_box->Add(record_box.outer, wxSizerFlags().Expand()); - SetSizerAndFit(tab_box.outer); -} - -PostTab::PostTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) - , m_ui(this) -{ - const int space = wxSizerFlags().Border().GetBorderInPixels(); - PaddedBoxSizer tab_box(wxVERTICAL); - PaddedBoxSizer shader_box(wxVERTICAL, this, "Shader Options"); - - // Bilinear filtering - auto* bil_filter_grid_box = new wxFlexGridSizer(2, space, space); - bil_filter_grid_box->AddGrowableCol(1); - - m_ui.addComboBoxAndLabel(bil_filter_grid_box, "Bilinear Filtering:", "linear_present_mode", &theApp.m_gs_tex_display_list, IDC_LINEAR_PRESENT); - - shader_box->Add(bil_filter_grid_box, wxSizerFlags().Expand()); - - // Sharpening, fxaa - PaddedBoxSizer sharpening_box(wxVERTICAL, this, "Sharpening/Anti-aliasing"); - auto* casmode_grid = new wxFlexGridSizer(2, space, space); - casmode_grid->AddGrowableCol(1); - - m_ui.addComboBoxAndLabel(casmode_grid, "Contrast Adaptive Sharpening:", "CASMode", &theApp.m_gs_casmode); - - sharpening_box->Add(casmode_grid, wxSizerFlags().Expand()); - - auto* sharpness_grid = new wxFlexGridSizer(2, space, space); - sharpness_grid->AddGrowableCol(1); - - m_ui.addSliderAndLabel(sharpness_grid, "Sharpness:", "CASSharpness", 0, 100, 50, -1); - - sharpening_box->Add(sharpness_grid, wxSizerFlags().Expand()); - - auto* fxaa_grid = new wxFlexGridSizer(2, space, space); - fxaa_grid->AddGrowableCol(1); - - m_ui.addCheckBox(fxaa_grid, "FXAA (PgUp)", "fxaa", IDC_FXAA); - - sharpening_box->Add(fxaa_grid, wxSizerFlags().Expand()); - - shader_box->Add(sharpening_box.outer, wxSizerFlags().Expand()); - - // Shade boost - CheckboxPrereq shade_boost_check(m_ui.addCheckBox(shader_box.inner, "Enable Shade Boost", "ShadeBoost", IDC_SHADEBOOST)); - PaddedBoxSizer shade_boost_box(wxVERTICAL, this, "Shade Boost"); - auto* shader_boost_grid = new wxFlexGridSizer(2, space, space); - shader_boost_grid->AddGrowableCol(1); - - m_ui.addSliderAndLabel(shader_boost_grid, "Brightness:", "ShadeBoost_Brightness", 0, 100, 50, -1, shade_boost_check); - m_ui.addSliderAndLabel(shader_boost_grid, "Contrast:", "ShadeBoost_Contrast", 0, 100, 50, -1, shade_boost_check); - m_ui.addSliderAndLabel(shader_boost_grid, "Saturation:", "ShadeBoost_Saturation", 0, 100, 50, -1, shade_boost_check); - - shade_boost_box->Add(shader_boost_grid, wxSizerFlags().Expand()); - shader_box->Add(shade_boost_box.outer, wxSizerFlags().Expand()); - - // TV Shader - auto* tv_box = new wxFlexGridSizer(2, space, space); - tv_box->AddGrowableCol(1); - - m_ui.addComboBoxAndLabel(tv_box, "TV Shader:", "TVShader", &theApp.m_gs_tv_shaders); - - shader_box->Add(tv_box, wxSizerFlags().Expand()); - tab_box->Add(shader_box.outer, wxSizerFlags().Expand()); - - SetSizerAndFit(tab_box.outer); -} - -OSDTab::OSDTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) - , m_ui(this) -{ - const int space = wxSizerFlags().Border().GetBorderInPixels(); - PaddedBoxSizer tab_box(wxVERTICAL); - - PaddedBoxSizer font_box(wxVERTICAL, this, "Visuals"); - auto* font_grid = new wxFlexGridSizer(2, space, space); - font_grid->AddGrowableCol(1); - - m_ui.addSliderAndLabel(font_grid, "OSD Scale:", "OsdScale", 50, 300, 100, -1); - - font_box->Add(font_grid, wxSizerFlags().Expand()); - tab_box->Add(font_box.outer, wxSizerFlags().Expand()); - - PaddedBoxSizer log_box(wxVERTICAL, this, "Log Messages"); - auto* log_grid = new wxFlexGridSizer(2, space, space); - log_grid->AddGrowableCol(1); - - m_ui.addCheckBox(log_grid, "Show Notifications", "OsdShowMessages", -1); - m_ui.addCheckBox(log_grid, "Show Speed", "OsdShowSpeed", -1); - m_ui.addCheckBox(log_grid, "Show FPS", "OsdShowFPS", -1); - m_ui.addCheckBox(log_grid, "Show CPU Usage", "OsdShowCPU", -1); - m_ui.addCheckBox(log_grid, "Show GPU Usage", "OsdShowGPU", -1); - m_ui.addCheckBox(log_grid, "Show Resolution", "OsdShowResolution", -1); - m_ui.addCheckBox(log_grid, "Show Statistics", "OsdShowGSStats", -1); - m_ui.addCheckBox(log_grid, "Show Indicators", "OsdShowIndicators", -1); - m_ui.addCheckBox(log_grid, "Show Settings", "OsdShowSettings", -1); - m_ui.addCheckBox(log_grid, "Show Inputs", "OsdShowInputs", -1); - - log_box->Add(log_grid, wxSizerFlags().Expand()); - tab_box->Add(log_box.outer, wxSizerFlags().Expand()); - - SetSizerAndFit(tab_box.outer); -} - -DebugTab::DebugTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) - , m_ui(this) -{ - const int space = wxSizerFlags().Border().GetBorderInPixels(); - PaddedBoxSizer tab_box(wxVERTICAL); - - auto vk_ogl_hw_prereq = [this] { return m_is_ogl_hw || m_is_vk_hw; }; - - if (g_Conf->DevMode || IsDevBuild) - { - PaddedBoxSizer debug_box(wxVERTICAL, this, "Debug"); - auto* debug_check_box = new wxFlexGridSizer(2, space, space); - m_ui.addCheckBox(debug_check_box, "Disable Dual-Source Blending", "DisableDualSourceBlend"); - m_ui.addCheckBox(debug_check_box, "Disable Framebuffer Fetch", "DisableFramebufferFetch"); - m_ui.addCheckBox(debug_check_box, "Disable Shader Cache", "disable_shader_cache"); - m_ui.addCheckBox(debug_check_box, "Use Blit Swap Chain", "UseBlitSwapChain"); - m_ui.addCheckBox(debug_check_box, "Dump GS data", "dump"); - m_ui.addCheckBox(debug_check_box, "Use Debug Device", "UseDebugDevice"); - - auto* debug_save_check_box = new wxWrapSizer(wxHORIZONTAL); - m_ui.addCheckBox(debug_save_check_box, "Save RT", "save"); - m_ui.addCheckBox(debug_save_check_box, "Save Frame", "savef"); - m_ui.addCheckBox(debug_save_check_box, "Save Texture", "savet"); - m_ui.addCheckBox(debug_save_check_box, "Save Depth", "savez"); - - debug_box->Add(debug_check_box); - debug_box->AddSpacer(space); - debug_box->Add(debug_save_check_box); - - auto* dump_grid = new wxFlexGridSizer(2, space, space); - - m_ui.addSpinAndLabel(dump_grid, "Start of Dump:", "saven", 0, pow(10, 9), 0); - m_ui.addSpinAndLabel(dump_grid, "Length of Dump:", "savel", 1, pow(10, 5), 5000); - - debug_box->AddSpacer(space); - debug_box->Add(dump_grid); - - tab_box->Add(debug_box.outer, wxSizerFlags().Expand()); - } - - PaddedBoxSizer ogl_box(wxVERTICAL, this, "Overrides"); - auto* ogl_grid = new wxFlexGridSizer(2, space, space); - m_ui.addComboBoxAndLabel(ogl_grid, "Texture Barriers:", "OverrideTextureBarriers", &theApp.m_gs_generic_list, -1, vk_ogl_hw_prereq); - m_ui.addComboBoxAndLabel(ogl_grid, "Geometry Shader:", "OverrideGeometryShaders", &theApp.m_gs_generic_list, IDC_GEOMETRY_SHADER_OVERRIDE, vk_ogl_hw_prereq); - m_ui.addComboBoxAndLabel(ogl_grid, "Hardware Download Mode:", "HWDownloadMode", &theApp.m_gs_hw_download_mode, -1); - m_ui.addComboBoxAndLabel(ogl_grid, "Dump Compression:", "GSDumpCompression", &theApp.m_gs_dump_compression, -1); - ogl_box->Add(ogl_grid); - - tab_box->Add(ogl_box.outer, wxSizerFlags().Expand()); - - PaddedBoxSizer tex_box(wxVERTICAL, this, "Texture Replacements"); - auto* tex_grid = new wxFlexGridSizer(2, space, space); - m_ui.addCheckBox(tex_grid, "Dump Textures", "DumpReplaceableTextures", -1); - m_ui.addCheckBox(tex_grid, "Dump Mipmaps", "DumpReplaceableMipmaps", -1); - m_ui.addCheckBox(tex_grid, "Dump FMV Textures", "DumpTexturesWithFMVActive", -1); - m_ui.addCheckBox(tex_grid, "Async Texture Loading", "LoadTextureReplacementsAsync", -1); - m_ui.addCheckBox(tex_grid, "Load Textures", "LoadTextureReplacements", -1); - m_ui.addCheckBox(tex_grid, "Precache Textures", "PrecacheTextureReplacements", -1); - tex_box->Add(tex_grid); - - tab_box->Add(tex_box.outer, wxSizerFlags().Expand()); - - SetSizerAndFit(tab_box.outer); -} - -void DebugTab::DoUpdate() -{ - m_ui.Update(); -} - -Dialog::Dialog() - : wxDialog(nullptr, wxID_ANY, "Graphics Settings", wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER) - , m_ui(this) -{ - const int space = wxSizerFlags().Border().GetBorderInPixels(); - auto* padding = new wxBoxSizer(wxVERTICAL); - m_top_box = new wxBoxSizer(wxVERTICAL); - - auto* top_grid = new wxFlexGridSizer(2, space, space); - top_grid->SetFlexibleDirection(wxHORIZONTAL); - - m_renderer_select = m_ui.addComboBoxAndLabel(top_grid, "Renderer:", "Renderer", &theApp.m_gs_renderers).first; - m_renderer_select->Bind(wxEVT_CHOICE, &Dialog::OnRendererChange, this); - - add_label(this, top_grid, "Adapter:"); - m_adapter_select = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, {}); - top_grid->Add(m_adapter_select, wxSizerFlags().Expand()); - - m_ui.addComboBoxAndLabel(top_grid, "Deinterlacing (F5):", "deinterlace_mode", &theApp.m_gs_deinterlace); - - m_bifilter_select = m_ui.addComboBoxAndLabel(top_grid, "Texture Filtering:", "filter", &theApp.m_gs_bifilter, IDC_FILTER).first; - - auto* book = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize); - - m_renderer_panel = new RendererTab(book); - m_hacks_panel = new HacksTab(book); - m_rec_panel = new RecTab(book); - m_post_panel = new PostTab(book); - m_osd_panel = new OSDTab(book); - m_debug_panel = new DebugTab(book); - - book->AddPage(m_renderer_panel, "Renderer", true); - book->AddPage(m_hacks_panel, "Hacks"); - book->AddPage(m_post_panel, "Shader"); - book->AddPage(m_osd_panel, "OSD"); - book->AddPage(m_rec_panel, "Recording"); - book->AddPage(m_debug_panel, "Advanced"); - - m_top_box->Add(top_grid, wxSizerFlags().Centre()); - m_top_box->AddSpacer(space); - m_top_box->Add(book, wxSizerFlags(1).Expand()); - - padding->Add(m_top_box, wxSizerFlags(1).Expand().Border()); - - m_top_box->Add(CreateStdDialogButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Right()); - - SetSizerAndFit(padding); - Bind(wxEVT_CHECKBOX, &Dialog::CallUpdate, this); - Bind(wxEVT_SPINCTRL, &Dialog::CallUpdate, this); - Bind(wxEVT_CHOICE, &Dialog::CallUpdate, this); -} - -Dialog::~Dialog() -{ -} - -void Dialog::CallUpdate(wxCommandEvent&) -{ - Update(); -} - -void Dialog::OnRendererChange(wxCommandEvent&) -{ - RendererChange(); - Update(); -} - -GSRendererType Dialog::GetSelectedRendererType() -{ - const int index = m_renderer_select->GetSelection(); - - // there is no currently selected renderer or the combo box has more entries than the renderer list or the current selection is negative - // make sure you haven't made a mistake initializing everything - ASSERT(index < static_cast(theApp.m_gs_renderers.size()) || index >= 0); - - const GSRendererType type = static_cast(theApp.m_gs_renderers[index].value); - return (type == GSRendererType::Auto) ? GSUtil::GetPreferredRenderer() : type; -} - -void Dialog::RendererChange() -{ - const GSRendererType renderer = GetSelectedRendererType(); - const std::string current_adapter(theApp.GetConfigS("Adapter")); - - HostDisplay::AdapterAndModeList list; - switch (renderer) - { -#ifdef _WIN32 - case GSRendererType::DX11: - list = D3D11HostDisplay::StaticGetAdapterAndModeList(); - break; - case GSRendererType::DX12: - list = D3D12HostDisplay::StaticGetAdapterAndModeList(); - break; -#endif -#ifdef ENABLE_VULKAN - case GSRendererType::VK: - list = VulkanHostDisplay::StaticGetAdapterAndModeList(nullptr); - break; -#endif -#ifdef __APPLE__ - case GSRendererType::Metal: - list = GetMetalAdapterAndModeList(); - break; -#endif - default: - break; - } - - m_adapter_select->Clear(); - m_adapter_select->Insert(_("Default Adapter"), 0); - if (current_adapter.empty()) - m_adapter_select->SetSelection(0); - - for (const std::string& name : list.adapter_names) - { - m_adapter_select->Insert(fromUTF8(name), m_adapter_select->GetCount()); - if (current_adapter == name) - m_adapter_select->SetSelection(m_adapter_select->GetCount() - 1); - } - - m_adapter_select->Enable(!list.adapter_names.empty()); - -#ifdef _WIN32 - m_renderer_panel->Layout(); // The version of wx we use on Windows is dumb and something prevents relayout from happening to notebook pages -#endif -} - -void Dialog::Load() -{ - m_ui.Load(); - - const GSRendererType renderer = GSRendererType(theApp.GetConfigI("Renderer")); - m_renderer_select->SetSelection(get_config_index(theApp.m_gs_renderers, static_cast(renderer))); - - RendererChange(); - - m_hacks_panel->Load(); - m_renderer_panel->Load(); - m_rec_panel->Load(); - m_post_panel->Load(); - m_osd_panel->Load(); - m_debug_panel->Load(); -} - -void Dialog::Save() -{ - m_ui.Save(); - // only save the adapter when it makes sense to - // prevents changing the adapter, switching to another renderer and saving - if (m_adapter_select->GetCount() > 1) - { - // First option is system default - if (m_adapter_select->GetSelection() == 0) - theApp.SetConfig("Adapter", ""); - else - theApp.SetConfig("Adapter", m_adapter_select->GetStringSelection().c_str()); - } - - m_hacks_panel->Save(); - m_renderer_panel->Save(); - m_rec_panel->Save(); - m_post_panel->Save(); - m_osd_panel->Save(); - m_debug_panel->Save(); -} - -void Dialog::Update() -{ - GSRendererType renderer = GetSelectedRendererType(); - if (renderer == GSRendererType::Null) - { - m_ui.DisableAll(); - m_renderer_select->Enable(); - m_hacks_panel->m_ui.DisableAll(); - m_renderer_panel->m_ui.DisableAll(); - m_rec_panel->m_ui.DisableAll(); - m_post_panel->m_ui.DisableAll(); - m_osd_panel->m_ui.DisableAll(); - m_debug_panel->m_ui.DisableAll(); - } - else - { - // cross-tab dependencies yay - const bool is_hw = renderer == GSRendererType::OGL || renderer == GSRendererType::DX11 || renderer == GSRendererType::VK || renderer == GSRendererType::Metal || renderer == GSRendererType::DX12; - const bool is_upscale = m_renderer_panel->m_internal_resolution->GetSelection() != 0; - m_hacks_panel->m_is_native_res = !is_hw || !is_upscale; - m_hacks_panel->m_is_hardware = is_hw; - m_renderer_panel->m_is_hardware = is_hw; - m_debug_panel->m_is_ogl_hw = renderer == GSRendererType::OGL; - m_debug_panel->m_is_vk_hw = renderer == GSRendererType::VK; - - m_ui.Update(); - m_hacks_panel->DoUpdate(); - m_renderer_panel->DoUpdate(); - m_rec_panel->DoUpdate(); - m_post_panel->DoUpdate(); - m_osd_panel->DoUpdate(); - m_debug_panel->DoUpdate(); - } -} - -bool RunwxDialog() -{ - Dialog GSSettingsDialog; - - GSSettingsDialog.Load(); - GSSettingsDialog.Update(); - if (GSSettingsDialog.ShowModal() == wxID_OK) - GSSettingsDialog.Save(); - - return true; -} diff --git a/pcsx2/GS/Window/GSwxDialog.h b/pcsx2/GS/Window/GSwxDialog.h deleted file mode 100644 index 7800f9f2cf..0000000000 --- a/pcsx2/GS/Window/GSwxDialog.h +++ /dev/null @@ -1,205 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "GS.h" -#include "GSSetting.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class GSUIElementHolder -{ - class GSwxChoice : public wxChoice - { - public: - const std::vector& settings; - - GSwxChoice( - wxWindow* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - const std::vector* settings, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) - : wxChoice(parent, id, pos, size, choices, style, validator, name) - , settings(*settings) - { - } - }; - - struct UIElem - { - enum class Type - { - CheckBox, - Choice, - Spin, - Slider, - File, - Directory, - }; - - Type type; - wxControl* control; - const char* config; - std::function prereq; - - UIElem(Type type, wxControl* control, const char* config, std::function prereq) - : type(type), control(control), config(config), prereq(prereq) - { - } - }; - - static bool noPrereq() { return true; } - - wxWindow* m_window; - std::vector m_elems; - - wxStaticText* addWithLabel(wxControl* control, UIElem::Type type, wxSizer* sizer, const char* label, const char* config_name, int tooltip, std::function prereq, wxSizerFlags flags = wxSizerFlags().Centre().Expand().Left()); - -public: - GSUIElementHolder(wxWindow* window); - wxCheckBox* addCheckBox(wxSizer* sizer, const char* label, const char* config_name, int tooltip = -1, std::function prereq = noPrereq); - std::pair addComboBoxAndLabel(wxSizer* sizer, const char* label, const char* config_name, const std::vector* settings, int tooltip = -1, std::function prereq = noPrereq); - wxSpinCtrl* addSpin(wxSizer* sizer, const char* config_name, int min, int max, int initial, int tooltip = -1, std::function prereq = noPrereq); - std::pair addSpinAndLabel(wxSizer* sizer, const char* label, const char* config_name, int min, int max, int initial, int tooltip = -1, std::function prereq = noPrereq); - std::pair addSliderAndLabel(wxSizer* sizer, const char* label, const char* config_name, int min, int max, int initial, int tooltip = -1, std::function prereq = noPrereq); - std::pair addFilePickerAndLabel(wxSizer* sizer, const char* label, const char* config_name, int tooltip = -1, std::function prereq = noPrereq); - std::pair addDirPickerAndLabel(wxSizer* sizer, const char* label, const char* config_name, int tooltip = -1, std::function prereq = noPrereq); - - void Load(); - void Save(); - void Update(); - void DisableAll(); -}; - -namespace GSSettingsDialog -{ - class RendererTab : public wxPanel - { - public: - GSUIElementHolder m_ui; - wxChoice* m_internal_resolution; - bool m_is_hardware = false; - - RendererTab(wxWindow* parent); - void Load() { m_ui.Load(); } - void Save() { m_ui.Save(); } - void DoUpdate() { m_ui.Update(); } - }; - - class HacksTab : public wxPanel - { - public: - GSUIElementHolder m_ui; - wxSpinCtrl *skip_x_spin, *skip_y_spin; - bool m_is_hardware = false; - bool m_is_native_res = false; - - HacksTab(wxWindow* parent); - void Load() { m_ui.Load(); } - void Save() { m_ui.Save(); } - void DoUpdate(); - }; - - class DebugTab : public wxPanel - { - public: - GSUIElementHolder m_ui; - bool m_is_ogl_hw = false; - bool m_is_vk_hw = false; - - DebugTab(wxWindow* parent); - void Load() { m_ui.Load(); } - void Save() { m_ui.Save(); } - void DoUpdate(); - }; - - class RecTab : public wxPanel - { - public: - GSUIElementHolder m_ui; - - RecTab(wxWindow* parent); - void Load() { m_ui.Load(); } - void Save() { m_ui.Save(); } - void DoUpdate() { m_ui.Update(); } - }; - - class PostTab : public wxPanel - { - public: - GSUIElementHolder m_ui; - - PostTab(wxWindow* parent); - void Load() { m_ui.Load(); } - void Save() { m_ui.Save(); } - void DoUpdate() { m_ui.Update(); } - }; - - class OSDTab : public wxPanel - { - public: - GSUIElementHolder m_ui; - - OSDTab(wxWindow* parent); - void Load() { m_ui.Load(); } - void Save() { m_ui.Save(); } - void DoUpdate() { m_ui.Update(); } - }; - - class Dialog : public wxDialog - { - GSUIElementHolder m_ui; - - wxBoxSizer* m_top_box; - wxChoice* m_renderer_select; - wxChoice* m_adapter_select; - wxChoice* m_bifilter_select; - RendererTab* m_renderer_panel; - HacksTab* m_hacks_panel; - DebugTab* m_debug_panel; - RecTab* m_rec_panel; - PostTab* m_post_panel; - OSDTab* m_osd_panel; - - public: - Dialog(); - ~Dialog(); - void Load(); - void Save(); - void Update(); - void CallUpdate(wxCommandEvent& event); - void OnRendererChange(wxCommandEvent& event); - void RendererChange(); - GSRendererType GetSelectedRendererType(); - }; - -} // namespace GSSettingsDialog - -extern bool RunwxDialog(); diff --git a/pcsx2/Linux/LnxConsolePipe.cpp b/pcsx2/Linux/LnxConsolePipe.cpp deleted file mode 100644 index 8b3510262c..0000000000 --- a/pcsx2/Linux/LnxConsolePipe.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2015 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "common/StringUtil.h" -#include "gui/App.h" -#include "gui/ConsoleLogger.h" -#include - -using namespace Threading; - -// Redirects and reads data sent to stdout/stderr and sends it to the PCSX2 -// console. -class LinuxPipeThread : public pxThread -{ - typedef pxThread _parent; - -protected: - FILE* m_stdstream; - FILE* m_fp; - const ConsoleColors m_color; - int m_pipe_fd[2]; - - void ExecuteTaskInThread(); -public: - LinuxPipeThread(FILE* stdstream); - virtual ~LinuxPipeThread(); -}; - -LinuxPipeThread::LinuxPipeThread(FILE* stdstream) - : pxThread(stdstream == stderr? L"Redirect_Stderr" : L"Redirect_Stdout") - , m_stdstream(stdstream) - , m_fp(nullptr) - , m_color(stdstream == stderr? Color_Red : Color_Black) - , m_pipe_fd{-1, -1} -{ - const wxChar* stream_name = stdstream == stderr? L"stderr" : L"stdout"; - - // Save the original stdout/stderr file descriptor - int dup_fd = dup(fileno(stdstream)); - if (dup_fd == -1) - throw Exception::RuntimeError().SetDiagMsg(StringUtil::StdStringFromFormat( - "Redirect %s failed: dup: %s", stream_name, strerror(errno))); - m_fp = fdopen(dup_fd, "w"); - if (m_fp == nullptr) { - int error = errno; - close(dup_fd); - throw Exception::RuntimeError().SetDiagMsg(StringUtil::StdStringFromFormat( - "Redirect %s failed: fdopen: %s", stream_name, strerror(error))); - } - - if (pipe(m_pipe_fd) == -1) { - int error = errno; - fclose(m_fp); - throw Exception::RuntimeError().SetDiagMsg(StringUtil::StdStringFromFormat( - "Redirect %s failed: pipe: %s", stream_name, strerror(error))); - } -} - -LinuxPipeThread::~LinuxPipeThread() -{ - // Close write end of the pipe first so the redirection thread starts - // finishing up and restore the original stdout/stderr file descriptor so - // messages aren't lost. - dup2(fileno(m_fp), m_pipe_fd[1]); - - if (m_stdstream == stdout) - Console_SetStdout(stdout); - fclose(m_fp); - - // Read end of pipe should only be closed after the thread terminates to - // prevent messages being lost. - m_mtx_InThread.Wait(); - close(m_pipe_fd[0]); -} - -void LinuxPipeThread::ExecuteTaskInThread() -{ - const wxChar* stream_name = m_stdstream == stderr? L"stderr" : L"stdout"; - - // Redirect stdout/stderr - int stdstream_fd = fileno(m_stdstream); - if (dup2(m_pipe_fd[1], stdstream_fd) != stdstream_fd) { - Console.Error(wxString::Format(L"Redirect %s failed: dup2: %s", - stream_name, strerror(errno))); - return; - } - - close(m_pipe_fd[1]); - m_pipe_fd[1] = stdstream_fd; - - // Send console output to the original stdout, otherwise there'll be an - // infinite loop. - if (m_stdstream == stdout) - Console_SetStdout(m_fp); - - char buffer[2049]; - while (ssize_t bytes_read = read(m_pipe_fd[0], buffer, sizeof(buffer) - 1)) { - if (bytes_read == -1) { - if (errno == EINTR) { - continue; - } else { - // Should never happen. - Console.Error(wxString::Format(L"Redirect %s failed: read: %s", - stream_name, strerror(errno))); - break; - } - } - - buffer[bytes_read] = 0; - - { - ConsoleColorScope cs(m_color); - Console.WriteRaw(fromUTF8(buffer)); - } - } -} - -class LinuxPipeRedirection : public PipeRedirectionBase -{ - DeclareNoncopyableObject(LinuxPipeRedirection); - -protected: - LinuxPipeThread m_thread; - -public: - LinuxPipeRedirection(FILE* stdstream); - virtual ~LinuxPipeRedirection() = default; -}; - -LinuxPipeRedirection::LinuxPipeRedirection(FILE* stdstream) - : m_thread(stdstream) -{ - pxAssert((stdstream == stderr) || (stdstream == stdout)); - - try { - m_thread.Start(); - } catch (Exception::BaseThreadError& ex) { - // thread object will become invalid because of scoping after we leave - // the constructor, so re-pack a new exception: - throw Exception::RuntimeError().SetDiagMsg(ex.FormatDiagnosticMessage()); - } -} - -PipeRedirectionBase* NewPipeRedir(FILE* stdstream) -{ - try { - return new LinuxPipeRedirection(stdstream); - } catch (Exception::RuntimeError& ex) { - Console.Error(ex.FormatDiagnosticMessage()); - } - - return nullptr; -} diff --git a/pcsx2/Linux/LnxKeyCodes.cpp b/pcsx2/Linux/LnxKeyCodes.cpp deleted file mode 100644 index 226a12c2c0..0000000000 --- a/pcsx2/Linux/LnxKeyCodes.cpp +++ /dev/null @@ -1,294 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/ConsoleLogger.h" - -#include - -// Returns a WXK_* keycode, given some kinda GDK input mess! -int TranslateGDKtoWXK( u32 keysym ) -{ - int key_code; - - switch ( keysym ) - { - // Shift, Control and Alt don't generate the CHAR events at all - case GDK_KEY_Shift_L: - case GDK_KEY_Shift_R: - key_code = WXK_SHIFT; - break; - case GDK_KEY_Control_L: - case GDK_KEY_Control_R: - key_code = WXK_CONTROL; - break; - case GDK_KEY_Meta_L: - case GDK_KEY_Meta_R: - case GDK_KEY_Alt_L: - case GDK_KEY_Alt_R: - case GDK_KEY_Super_L: - case GDK_KEY_Super_R: - key_code = WXK_ALT; - break; - - // neither do the toggle modifies - case GDK_KEY_Scroll_Lock: - key_code = WXK_SCROLL; - break; - - case GDK_KEY_Caps_Lock: - key_code = WXK_CAPITAL; - break; - - case GDK_KEY_Num_Lock: - key_code = WXK_NUMLOCK; - break; - - - // various other special keys - case GDK_KEY_Menu: - key_code = WXK_MENU; - break; - - case GDK_KEY_Help: - key_code = WXK_HELP; - break; - - case GDK_KEY_BackSpace: - key_code = WXK_BACK; - break; - - case GDK_KEY_ISO_Left_Tab: - case GDK_KEY_Tab: - key_code = WXK_TAB; - break; - - case GDK_KEY_Linefeed: - case GDK_KEY_Return: - key_code = WXK_RETURN; - break; - - case GDK_KEY_Clear: - key_code = WXK_CLEAR; - break; - - case GDK_KEY_Pause: - key_code = WXK_PAUSE; - break; - - case GDK_KEY_Select: - key_code = WXK_SELECT; - break; - - case GDK_KEY_Print: - key_code = WXK_PRINT; - break; - - case GDK_KEY_Execute: - key_code = WXK_EXECUTE; - break; - - case GDK_KEY_Escape: - key_code = WXK_ESCAPE; - break; - - // cursor and other extended keyboard keys - case GDK_KEY_Delete: - key_code = WXK_DELETE; - break; - - case GDK_KEY_Home: - key_code = WXK_HOME; - break; - - case GDK_KEY_Left: - key_code = WXK_LEFT; - break; - - case GDK_KEY_Up: - key_code = WXK_UP; - break; - - case GDK_KEY_Right: - key_code = WXK_RIGHT; - break; - - case GDK_KEY_Down: - key_code = WXK_DOWN; - break; - - case GDK_KEY_Prior: // == GDK_KEY_Page_Up - key_code = WXK_PAGEUP; - break; - - case GDK_KEY_Next: // == GDK_KEY_Page_Down - key_code = WXK_PAGEDOWN; - break; - - case GDK_KEY_End: - key_code = WXK_END; - break; - - case GDK_KEY_Begin: - key_code = WXK_HOME; - break; - - case GDK_KEY_Insert: - key_code = WXK_INSERT; - break; - - - // numpad keys - case GDK_KEY_KP_0: - case GDK_KEY_KP_1: - case GDK_KEY_KP_2: - case GDK_KEY_KP_3: - case GDK_KEY_KP_4: - case GDK_KEY_KP_5: - case GDK_KEY_KP_6: - case GDK_KEY_KP_7: - case GDK_KEY_KP_8: - case GDK_KEY_KP_9: - key_code = WXK_NUMPAD0 + keysym - GDK_KEY_KP_0; - break; - - case GDK_KEY_KP_Space: - key_code = WXK_NUMPAD_SPACE; - break; - - case GDK_KEY_KP_Tab: - key_code = WXK_NUMPAD_TAB; - break; - - case GDK_KEY_KP_Enter: - key_code = WXK_NUMPAD_ENTER; - break; - - case GDK_KEY_KP_F1: - key_code = WXK_NUMPAD_F1; - break; - - case GDK_KEY_KP_F2: - key_code = WXK_NUMPAD_F2; - break; - - case GDK_KEY_KP_F3: - key_code = WXK_NUMPAD_F3; - break; - - case GDK_KEY_KP_F4: - key_code = WXK_NUMPAD_F4; - break; - - case GDK_KEY_KP_Home: - key_code = WXK_NUMPAD_HOME; - break; - - case GDK_KEY_KP_Left: - key_code = WXK_NUMPAD_LEFT; - break; - - case GDK_KEY_KP_Up: - key_code = WXK_NUMPAD_UP; - break; - - case GDK_KEY_KP_Right: - key_code = WXK_NUMPAD_RIGHT; - break; - - case GDK_KEY_KP_Down: - key_code = WXK_NUMPAD_DOWN; - break; - - case GDK_KEY_KP_Prior: // == GDK_KEY_KP_Page_Up - key_code = WXK_NUMPAD_PAGEUP; - break; - - case GDK_KEY_KP_Next: // == GDK_KEY_KP_Page_Down - key_code = WXK_NUMPAD_PAGEDOWN; - break; - - case GDK_KEY_KP_End: - key_code = WXK_NUMPAD_END; - break; - - case GDK_KEY_KP_Begin: - key_code = WXK_NUMPAD_BEGIN; - break; - - case GDK_KEY_KP_Insert: - key_code = WXK_NUMPAD_INSERT; - break; - - case GDK_KEY_KP_Delete: - key_code = WXK_NUMPAD_DELETE; - break; - - case GDK_KEY_KP_Equal: - key_code = WXK_NUMPAD_EQUAL; - break; - - case GDK_KEY_KP_Multiply: - key_code = WXK_NUMPAD_MULTIPLY; - break; - - case GDK_KEY_KP_Add: - key_code = WXK_NUMPAD_ADD; - break; - - case GDK_KEY_KP_Separator: - // FIXME: what is this? - // - // Some numeric keyboards have a comma on them. I believe this is the symbol - // for the comma, to distinguish it from the period on the numeric keypad. - // --arcum42 - key_code = WXK_NUMPAD_SEPARATOR; - break; - - case GDK_KEY_KP_Subtract: - key_code = WXK_NUMPAD_SUBTRACT; - break; - - case GDK_KEY_KP_Decimal: - key_code = WXK_NUMPAD_DECIMAL; - break; - - case GDK_KEY_KP_Divide: - key_code = WXK_NUMPAD_DIVIDE; - break; - - - // function keys - case GDK_KEY_F1: - case GDK_KEY_F2: - case GDK_KEY_F3: - case GDK_KEY_F4: - case GDK_KEY_F5: - case GDK_KEY_F6: - case GDK_KEY_F7: - case GDK_KEY_F8: - case GDK_KEY_F9: - case GDK_KEY_F10: - case GDK_KEY_F11: - case GDK_KEY_F12: - key_code = WXK_F1 + keysym - GDK_KEY_F1; - break; - - default: - key_code = 0; - } - - return key_code; -} diff --git a/pcsx2/PAD/Linux/Config.cpp b/pcsx2/PAD/Linux/Config.cpp deleted file mode 100644 index f74af285a8..0000000000 --- a/pcsx2/PAD/Linux/Config.cpp +++ /dev/null @@ -1,164 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "pcsx2/Config.h" -#include "Global.h" -#include "Device.h" -#include "keyboard.h" -#include "common/Path.h" -#ifdef __APPLE__ -#include -#endif - -void DefaultKeyboardValues() -{ -#ifdef __APPLE__ - set_keyboard_key(0, kVK_ANSI_A, PAD_L2); - set_keyboard_key(0, kVK_ANSI_Semicolon, PAD_R2); - set_keyboard_key(0, kVK_ANSI_W, PAD_L1); - set_keyboard_key(0, kVK_ANSI_P, PAD_R1); - set_keyboard_key(0, kVK_ANSI_I, PAD_TRIANGLE); - set_keyboard_key(0, kVK_ANSI_L, PAD_CIRCLE); - set_keyboard_key(0, kVK_ANSI_K, PAD_CROSS); - set_keyboard_key(0, kVK_ANSI_J, PAD_SQUARE); - set_keyboard_key(0, kVK_ANSI_V, PAD_SELECT); - set_keyboard_key(0, kVK_ANSI_N, PAD_START); - set_keyboard_key(0, kVK_ANSI_E, PAD_UP); - set_keyboard_key(0, kVK_ANSI_F, PAD_RIGHT); - set_keyboard_key(0, kVK_ANSI_D, PAD_DOWN); - set_keyboard_key(0, kVK_ANSI_S, PAD_LEFT); -#else - set_keyboard_key(0, XK_a, PAD_L2); - set_keyboard_key(0, XK_semicolon, PAD_R2); - set_keyboard_key(0, XK_w, PAD_L1); - set_keyboard_key(0, XK_p, PAD_R1); - set_keyboard_key(0, XK_i, PAD_TRIANGLE); - set_keyboard_key(0, XK_l, PAD_CIRCLE); - set_keyboard_key(0, XK_k, PAD_CROSS); - set_keyboard_key(0, XK_j, PAD_SQUARE); - set_keyboard_key(0, XK_v, PAD_SELECT); - set_keyboard_key(0, XK_n, PAD_START); - set_keyboard_key(0, XK_e, PAD_UP); - set_keyboard_key(0, XK_f, PAD_RIGHT); - set_keyboard_key(0, XK_d, PAD_DOWN); - set_keyboard_key(0, XK_s, PAD_LEFT); -#endif -} - -void PADSaveConfig() -{ - FILE* f; - - const std::string iniFile = Path::Combine(EmuFolders::Settings, "PAD.ini"); // default path, just in case - f = fopen(iniFile.c_str(), "w"); - if (f == NULL) - { - Console.Warning("PAD: failed to save ini %s", iniFile.c_str()); - return; - } - - fprintf(f, "first_time_wizard = %d\n", g_conf.ftw); - fprintf(f, "options = %d\n", g_conf.packed_options); - fprintf(f, "mouse_sensibility = %d\n", g_conf.get_sensibility()); - fprintf(f, "ff_intensity = %g\n", g_conf.get_ff_intensity()); - fprintf(f, "uid[0] = %zu\n", g_conf.get_joy_uid(0)); - fprintf(f, "uid[1] = %zu\n", g_conf.get_joy_uid(1)); - - for (u32 pad = 0; pad < GAMEPAD_NUMBER; pad++) - for (auto const& it : g_conf.keysym_map[pad]) - fprintf(f, "PAD %d:KEYSYM 0x%x = %d\n", pad, it.first, it.second); - - for (auto const& it : g_conf.sdl2_mapping) - fprintf(f, "SDL2 = %s\n", it.c_str()); - - for (auto const& pair : g_conf.sdl2_hints) - fprintf(f, "SDL_HINT_%s = %s\n", pair.first.c_str(), pair.second.c_str()); - - fclose(f); -} - -void PADLoadConfig() -{ - FILE* f; - bool have_user_setting = false; - - g_conf.init(); - - - const std::string iniFile = Path::Combine(EmuFolders::Settings, "PAD.ini"); // default path, just in case - f = fopen(iniFile.c_str(), "r"); - if (f == nullptr) - { - Console.Warning("PAD: failed to load ini %s", iniFile.c_str()); - PADSaveConfig(); //save and return - return; - } - - u32 value; - float fvalue; - - if (fscanf(f, "first_time_wizard = %u\n", &value) == 1) - g_conf.ftw = value; - - if (fscanf(f, "options = %u\n", &value) == 1) - g_conf.packed_options = value; - - if (fscanf(f, "mouse_sensibility = %u\n", &value) == 1) - g_conf.set_sensibility(value); - - if (fscanf(f, "ff_intensity = %f\n", &fvalue) == 1) - { - if (fvalue > 1) - fvalue /= 0x7fff; // Old config - g_conf.set_ff_intensity(fvalue); - } - - size_t uid; - if (fscanf(f, "uid[0] = %zu\n", &uid) == 1) - g_conf.set_joy_uid(0, uid); - if (fscanf(f, "uid[1] = %zu\n", &uid) == 1) - g_conf.set_joy_uid(1, uid); - - u32 pad; - u32 keysym; - u32 index; - - while (fscanf(f, "PAD %u:KEYSYM 0x%x = %u\n", &pad, &keysym, &index) == 3) - { - set_keyboard_key(pad & 1, keysym, index); - if (pad == 0) - have_user_setting = true; - } - - char extra_name[512]; - char extra_value[512]; - while (fscanf(f, "%511[^ =] = %511[^\n]\n", extra_name, extra_value) == 2) - { - static constexpr const char* HINT_PREFIX = "SDL_HINT_"; - if (strcmp(extra_name, "SDL2") == 0) - { - g_conf.sdl2_mapping.push_back(std::string(extra_value)); - } - else if (strncmp(extra_name, HINT_PREFIX, strlen(HINT_PREFIX)) == 0) - { - g_conf.sdl2_hints.push_back({extra_name + strlen(HINT_PREFIX), extra_value}); - } - } - - if (!have_user_setting) - DefaultKeyboardValues(); - - fclose(f); -} diff --git a/pcsx2/PAD/Linux/Config.h b/pcsx2/PAD/Linux/Config.h deleted file mode 100644 index 594f5449c4..0000000000 --- a/pcsx2/PAD/Linux/Config.h +++ /dev/null @@ -1,133 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "Global.h" - -class PADconf -{ - float ff_intensity; - u32 sensibility; - -public: - union - { - struct - { - u16 forcefeedback : 1; - u16 reverse_lx : 1; - u16 reverse_ly : 1; - u16 reverse_rx : 1; - u16 reverse_ry : 1; - u16 mouse_l : 1; - u16 mouse_r : 1; - u16 _free : 9; // The 9 remaining bits are unused, do what you wish with them ;) - } pad_options[GAMEPAD_NUMBER]; // One for each pads - u32 packed_options; // Only first 8 bits of each 16 bits series are really used, rest is padding - }; - - u32 ftw; - std::map keysym_map[GAMEPAD_NUMBER]; - std::array unique_id; - std::vector sdl2_mapping; - std::vector> sdl2_hints; - - PADconf() { init(); } - - void init() - { - ftw = 1; - packed_options = 0; - ff_intensity = 1.0; // set it at max value by default - sensibility = 100; - for (u32 pad = 0; pad < GAMEPAD_NUMBER; pad++) - { - keysym_map[pad].clear(); - } - unique_id.fill(0); - sdl2_mapping.clear(); - } - - void set_joy_uid(u32 pad, size_t uid) - { - if (pad < GAMEPAD_NUMBER) - unique_id[pad] = uid; - } - - size_t get_joy_uid(u32 pad) - { - if (pad < GAMEPAD_NUMBER) - return unique_id[pad]; - else - return 0; - } - - /** - * Return (a copy of) private memner ff_instensity - **/ - float get_ff_intensity() - { - return ff_intensity; - } - - /** - * Set intensity while checking that the new value is within - * valid range, more than 0x7FFF will cause pad not to rumble(and less than 0 is obviously bad) - **/ - void set_ff_intensity(float new_intensity) - { - ff_intensity = std::min(std::max(new_intensity, 0.f), 1.f); - } - - /** - * Set sensibility value. - * There will be an upper range, and less than 0 is obviously wrong. - * We are doing object oriented code, so members are definitely not supposed to be public. - **/ - void set_sensibility(u32 new_sensibility) - { - if (new_sensibility > 0) - { - sensibility = new_sensibility; - } - else - { - sensibility = 1; - } - } - - u32 get_sensibility() - { - return sensibility; - } -}; -extern PADconf g_conf; - -static __forceinline void set_keyboard_key(int pad, int keysym, int index) -{ - g_conf.keysym_map[pad][keysym] = index; -} - -static __forceinline int get_keyboard_key(int pad, int keysym) -{ - // You must use find instead of [] - // [] will create an element if the key does not exist and return 0 - std::map::iterator it = g_conf.keysym_map[pad].find(keysym); - if (it != g_conf.keysym_map[pad].end()) - return it->second; - else - return -1; -} diff --git a/pcsx2/PAD/Linux/Device.cpp b/pcsx2/PAD/Linux/Device.cpp deleted file mode 100644 index 6ae52ff703..0000000000 --- a/pcsx2/PAD/Linux/Device.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "Device.h" -#ifdef SDL_BUILD -#include "SDL/joystick.h" -#endif - -/** - * Following static methods are just forwarders to their backend - * This is where link between agnostic and specific code is done - **/ - -/** - * Safely dispatch to the Rumble method above - **/ -void Device::DoRumble(unsigned type, unsigned pad) -{ - int index = uid_to_index(pad); - if (index >= 0) - device_manager.devices[index]->Rumble(type, pad); -} - -size_t Device::index_to_uid(int index) -{ - if ((index >= 0) && (index < (int)device_manager.devices.size())) - return device_manager.devices[index]->GetUniqueIdentifier(); - else - return 0; -} - -int Device::uid_to_index(int pad) -{ - size_t uid = g_conf.get_joy_uid(pad); - - for (int i = 0; i < (int)device_manager.devices.size(); ++i) - { - if (device_manager.devices[i]->GetUniqueIdentifier() == uid) - return i; - } - - // Current uid wasn't found maybe the pad was unplugged. Or - // user didn't select it. Fallback to 1st pad for - // 1st player. And 2nd pad for 2nd player. - if ((int)device_manager.devices.size() > pad) - return pad; - - return -1; -} diff --git a/pcsx2/PAD/Linux/Device.h b/pcsx2/PAD/Linux/Device.h deleted file mode 100644 index 38e8c2ed12..0000000000 --- a/pcsx2/PAD/Linux/Device.h +++ /dev/null @@ -1,107 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "Global.h" -#include "InputManager.h" - -#ifdef SDL_BUILD -#include -#endif - -enum DeviceAPI -{ - NO_API = 0, - KEYBOARD_API = 16, - SDL_AUTO = 17 -}; - -enum DeviceType -{ - NO_DEVICE = 0, - KEYBOARD = 1, - MOUSE = 2, - OTHER = 3 -}; - -class Device -{ -public: - Device() - : m_unique_id(0) - , m_device_name("") - , api(NO_API) - , type(NO_DEVICE) - , m_deadzone(1500) - , m_no_error(false) - { - } - - virtual ~Device() - { - } - - Device(const Device&); // copy constructor - Device& operator=(const Device&); // assignment - - /* - * Update state of every attached devices - */ - virtual void UpdateDeviceState() = 0; - - /* - * Causes devices to rumble - * Rumble will differ according to type which is either 0(small motor) or 1(big motor) - */ - virtual void Rumble(unsigned type, unsigned pad) {} - /* - * Safely dispatch to the Rumble method above - */ - static void DoRumble(unsigned type, unsigned pad); - - /* - * Used for GUI checkbox to give feedback to the user - */ - virtual bool TestForce(float strength = 0.6) { return false; } - - virtual const char* GetName() = 0; - - virtual int GetInput(gamePadValues input) = 0; - - int GetDeadzone() - { - return m_deadzone; - } - - virtual size_t GetUniqueIdentifier() = 0; - - static size_t index_to_uid(int index); - static int uid_to_index(int pad); - - bool IsProperlyInitialized() - { - return m_no_error; - } - - size_t m_unique_id; - std::string m_device_name; - DeviceAPI api; - DeviceType type; - -protected: - int m_deadzone; - bool m_no_error; -}; diff --git a/pcsx2/PAD/Linux/Global.h b/pcsx2/PAD/Linux/Global.h deleted file mode 100644 index c2ba2a9aac..0000000000 --- a/pcsx2/PAD/Linux/Global.h +++ /dev/null @@ -1,117 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "common/Pcsx2Defs.h" -#include "bitwise.h" - -#include "common/Console.h" -#include "common/mt_queue.h" -#include "DebugTools/Debug.h" - -#define PADdefs - -static const u32 GAMEPAD_NUMBER = 2; -static const u32 MAX_KEYS = 24; - -#include "Config.h" - -enum gamePadValues -{ - PAD_L2 = 0, // L2 button - PAD_R2, // R2 button - PAD_L1, // L1 button - PAD_R1, // R1 button - PAD_TRIANGLE, // Triangle button â–² - PAD_CIRCLE, // Circle button â— - PAD_CROSS, // Cross button ✖ - PAD_SQUARE, // Square button â–  - PAD_SELECT, // Select button - PAD_L3, // Left joystick button (L3) - PAD_R3, // Right joystick button (R3) - PAD_START, // Start button - PAD_UP, // Directional pad ↑ - PAD_RIGHT, // Directional pad → - PAD_DOWN, // Directional pad ↓ - PAD_LEFT, // Directional pad ↠- PAD_L_UP, // Left joystick (Up) ↑ - PAD_L_RIGHT, // Left joystick (Right) → - PAD_L_DOWN, // Left joystick (Down) ↓ - PAD_L_LEFT, // Left joystick (Left) ↠- PAD_R_UP, // Right joystick (Up) ↑ - PAD_R_RIGHT, // Right joystick (Right) → - PAD_R_DOWN, // Right joystick (Down) ↓ - PAD_R_LEFT // Right joystick (Left) ↠-}; - -static const std::array all_keys = -{ - PAD_L2, // L2 button - PAD_R2, // R2 button - PAD_L1, // L1 button - PAD_R1, // R1 button - PAD_TRIANGLE, // Triangle button â–² - PAD_CIRCLE, // Circle button â— - PAD_CROSS, // Cross button ✖ - PAD_SQUARE, // Square button â–  - PAD_SELECT, // Select button - PAD_L3, // Left joystick button (L3) - PAD_R3, // Right joystick button (R3) - PAD_START, // Start button - PAD_UP, // Directional pad ↑ - PAD_RIGHT, // Directional pad → - PAD_DOWN, // Directional pad ↓ - PAD_LEFT, // Directional pad ↠- PAD_L_UP, // Left joystick (Up) ↑ - PAD_L_RIGHT, // Left joystick (Right) → - PAD_L_DOWN, // Left joystick (Down) ↓ - PAD_L_LEFT, // Left joystick (Left) ↠- PAD_R_UP, // Right joystick (Up) ↑ - PAD_R_RIGHT, // Right joystick (Right) → - PAD_R_DOWN, // Right joystick (Down) ↓ - PAD_R_LEFT // Right joystick (Left) ↠-}; - -enum PadOptions -{ - PADOPTION_FORCEFEEDBACK = 0x1, - PADOPTION_REVERSELX = 0x2, - PADOPTION_REVERSELY = 0x4, - PADOPTION_REVERSERX = 0x8, - PADOPTION_REVERSERY = 0x10, - PADOPTION_MOUSE_L = 0x20, - PADOPTION_MOUSE_R = 0x40, -}; - -static inline bool IsAnalogKey(int index) -{ - return ((index >= PAD_L_UP) && (index <= PAD_R_LEFT)); -} - -#include "KeyStatus.h" - -void PADLoadConfig(); -void PADSaveConfig(); diff --git a/pcsx2/PAD/Linux/Img/analog-2.png b/pcsx2/PAD/Linux/Img/analog-2.png deleted file mode 100644 index 0263c1ce16..0000000000 Binary files a/pcsx2/PAD/Linux/Img/analog-2.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/analog.png b/pcsx2/PAD/Linux/Img/analog.png deleted file mode 100644 index dbd8c19313..0000000000 Binary files a/pcsx2/PAD/Linux/Img/analog.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/arrow_bottom.png b/pcsx2/PAD/Linux/Img/arrow_bottom.png deleted file mode 100644 index 8ebc6d5535..0000000000 Binary files a/pcsx2/PAD/Linux/Img/arrow_bottom.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/arrow_left.png b/pcsx2/PAD/Linux/Img/arrow_left.png deleted file mode 100644 index 4000cb476f..0000000000 Binary files a/pcsx2/PAD/Linux/Img/arrow_left.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/arrow_right.png b/pcsx2/PAD/Linux/Img/arrow_right.png deleted file mode 100644 index c391d0025b..0000000000 Binary files a/pcsx2/PAD/Linux/Img/arrow_right.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/arrow_up.png b/pcsx2/PAD/Linux/Img/arrow_up.png deleted file mode 100644 index dc8de6ccde..0000000000 Binary files a/pcsx2/PAD/Linux/Img/arrow_up.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/circle.png b/pcsx2/PAD/Linux/Img/circle.png deleted file mode 100644 index cabc2681f5..0000000000 Binary files a/pcsx2/PAD/Linux/Img/circle.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/cross.png b/pcsx2/PAD/Linux/Img/cross.png deleted file mode 100644 index e108086ce1..0000000000 Binary files a/pcsx2/PAD/Linux/Img/cross.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/dp_bottom.png b/pcsx2/PAD/Linux/Img/dp_bottom.png deleted file mode 100644 index 0f69cdd4a5..0000000000 Binary files a/pcsx2/PAD/Linux/Img/dp_bottom.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/dp_left.png b/pcsx2/PAD/Linux/Img/dp_left.png deleted file mode 100644 index 1245499cfc..0000000000 Binary files a/pcsx2/PAD/Linux/Img/dp_left.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/dp_right.png b/pcsx2/PAD/Linux/Img/dp_right.png deleted file mode 100644 index 23fa90cbc0..0000000000 Binary files a/pcsx2/PAD/Linux/Img/dp_right.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/dp_up.png b/pcsx2/PAD/Linux/Img/dp_up.png deleted file mode 100644 index 60af347bb2..0000000000 Binary files a/pcsx2/PAD/Linux/Img/dp_up.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/dualshock2.png b/pcsx2/PAD/Linux/Img/dualshock2.png deleted file mode 100644 index a64cf8edc2..0000000000 Binary files a/pcsx2/PAD/Linux/Img/dualshock2.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/joystick_cursor.png b/pcsx2/PAD/Linux/Img/joystick_cursor.png deleted file mode 100644 index 8473398102..0000000000 Binary files a/pcsx2/PAD/Linux/Img/joystick_cursor.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/l1.png b/pcsx2/PAD/Linux/Img/l1.png deleted file mode 100644 index b1bb1187e8..0000000000 Binary files a/pcsx2/PAD/Linux/Img/l1.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/l2.png b/pcsx2/PAD/Linux/Img/l2.png deleted file mode 100644 index 0cd26db209..0000000000 Binary files a/pcsx2/PAD/Linux/Img/l2.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/l3.png b/pcsx2/PAD/Linux/Img/l3.png deleted file mode 100644 index eff4424d96..0000000000 Binary files a/pcsx2/PAD/Linux/Img/l3.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/r1.png b/pcsx2/PAD/Linux/Img/r1.png deleted file mode 100644 index 7f162ba21a..0000000000 Binary files a/pcsx2/PAD/Linux/Img/r1.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/r2.png b/pcsx2/PAD/Linux/Img/r2.png deleted file mode 100644 index 62ff3b217b..0000000000 Binary files a/pcsx2/PAD/Linux/Img/r2.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/r3.png b/pcsx2/PAD/Linux/Img/r3.png deleted file mode 100644 index 715b5e35ab..0000000000 Binary files a/pcsx2/PAD/Linux/Img/r3.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/select.png b/pcsx2/PAD/Linux/Img/select.png deleted file mode 100644 index e89e9fdc5c..0000000000 Binary files a/pcsx2/PAD/Linux/Img/select.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/square.png b/pcsx2/PAD/Linux/Img/square.png deleted file mode 100644 index bcbed6d51b..0000000000 Binary files a/pcsx2/PAD/Linux/Img/square.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/start.png b/pcsx2/PAD/Linux/Img/start.png deleted file mode 100644 index cce5853e05..0000000000 Binary files a/pcsx2/PAD/Linux/Img/start.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/Img/triangle.png b/pcsx2/PAD/Linux/Img/triangle.png deleted file mode 100644 index a3fd567242..0000000000 Binary files a/pcsx2/PAD/Linux/Img/triangle.png and /dev/null differ diff --git a/pcsx2/PAD/Linux/InputManager.cpp b/pcsx2/PAD/Linux/InputManager.cpp deleted file mode 100644 index 79b117fccf..0000000000 --- a/pcsx2/PAD/Linux/InputManager.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "InputManager.h" -#include "Device.h" -#include "keyboard.h" -#include "state_management.h" - -#ifdef SDL_BUILD -#include "SDL/joystick.h" -#endif - -InputDeviceManager device_manager; - -// Needs to be moved to individual device code, as does the keyboard input. -void PollForJoystickInput(int cpad) -{ - int index = Device::uid_to_index(cpad); - if (index < 0) - return; - - auto& gamePad = device_manager.devices[index]; - - gamePad->UpdateDeviceState(); - - for (u32 i = 0; i < MAX_KEYS; i++) - { - s32 value = gamePad->GetInput((gamePadValues)i); - if (value != 0) - g_key_status.press(cpad, i, value); - else - g_key_status.release(cpad, i); - } -} - -void InputDeviceManager::Update() -{ - // Poll keyboard/mouse event. There is currently no way to separate pad0 from pad1 event. - // So we will populate both pad in the same time - for (u32 cpad = 0; cpad < GAMEPAD_NUMBER; cpad++) - { - g_key_status.keyboard_state_acces(cpad); - } - UpdateKeyboardInput(); - - // Get joystick state + Commit - for (u32 cpad = 0; cpad < GAMEPAD_NUMBER; cpad++) - { - g_key_status.joystick_state_acces(cpad); - - PollForJoystickInput(cpad); - - g_key_status.commit_status(cpad); - } - - Pad::rumble_all(); -} - -/* - * Find and set up joysticks, potentially other devices. - */ -void EnumerateDevices() -{ -#ifdef SDL_BUILD - JoystickInfo::EnumerateJoysticks(device_manager.devices); -#endif -} diff --git a/pcsx2/PAD/Linux/InputManager.h b/pcsx2/PAD/Linux/InputManager.h deleted file mode 100644 index 4373a4f864..0000000000 --- a/pcsx2/PAD/Linux/InputManager.h +++ /dev/null @@ -1,36 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include - -class Device; - -class InputDeviceManager -{ -public: - void Update(); - - std::vector> devices; -}; - -extern InputDeviceManager device_manager; - -/* - * Find every interesting device and create right structure for them(depends on backend) - */ -extern void EnumerateDevices(); diff --git a/pcsx2/PAD/Linux/KeyStatus.cpp b/pcsx2/PAD/Linux/KeyStatus.cpp deleted file mode 100644 index 5bb92f4fcb..0000000000 --- a/pcsx2/PAD/Linux/KeyStatus.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "KeyStatus.h" -#include "Config.h" - -void KeyStatus::Init() -{ - for (u32 pad = 0; pad < GAMEPAD_NUMBER; pad++) - { - m_button[pad] = 0xFFFF; - m_internal_button_kbd[pad] = 0xFFFF; - m_internal_button_joy[pad] = 0xFFFF; - m_state_acces[pad] = false; - - for (u32 index = 0; index < MAX_KEYS; index++) - { - m_button_pressure[pad][index] = 0xFF; - m_internal_button_pressure[pad][index] = 0xFF; - } - - m_analog[pad].lx = m_analog_released_val; - m_analog[pad].ly = m_analog_released_val; - m_analog[pad].rx = m_analog_released_val; - m_analog[pad].ry = m_analog_released_val; - m_internal_analog_kbd[pad].lx = m_analog_released_val; - m_internal_analog_kbd[pad].ly = m_analog_released_val; - m_internal_analog_kbd[pad].rx = m_analog_released_val; - m_internal_analog_kbd[pad].ry = m_analog_released_val; - m_internal_analog_joy[pad].lx = m_analog_released_val; - m_internal_analog_joy[pad].ly = m_analog_released_val; - m_internal_analog_joy[pad].rx = m_analog_released_val; - m_internal_analog_joy[pad].ry = m_analog_released_val; - } -} - -void KeyStatus::press(u32 pad, u32 index, s32 value) -{ - if (!IsAnalogKey(index)) - { - m_internal_button_pressure[pad][index] = value; - if (m_state_acces[pad]) - clear_bit(m_internal_button_kbd[pad], index); - else - clear_bit(m_internal_button_joy[pad], index); - } - else - { - // clamp value - if (value > MAX_ANALOG_VALUE) - value = MAX_ANALOG_VALUE; - else if (value < -MAX_ANALOG_VALUE) - value = -MAX_ANALOG_VALUE; - - // Left -> -- -> Right - // Value range : FFFF8002 -> 0 -> 7FFE - // Force range : 80 -> 0 -> 7F - // Normal mode : expect value 0 -> 80 -> FF - // Reverse mode: expect value FF -> 7F -> 0 - u8 force = (value >> 8); - if (analog_is_reversed(pad, index)) - analog_set(pad, index, m_analog_released_val - force); - else - analog_set(pad, index, m_analog_released_val + force + 1); - } -} - -void KeyStatus::release(u32 pad, u32 index) -{ - if (!IsAnalogKey(index)) - { - if (m_state_acces[pad]) - set_bit(m_internal_button_kbd[pad], index); - else - set_bit(m_internal_button_joy[pad], index); - } - else - { - analog_set(pad, index, m_analog_released_val); - } -} - -u16 KeyStatus::get(u32 pad) -{ - return m_button[pad]; -} - -void KeyStatus::analog_set(u32 pad, u32 index, u8 value) -{ - PADAnalog* m_internal_analog_ref; - if (m_state_acces[pad]) - m_internal_analog_ref = &m_internal_analog_kbd[pad]; - else - m_internal_analog_ref = &m_internal_analog_joy[pad]; - - switch (index) - { - case PAD_R_LEFT: - case PAD_R_RIGHT: - m_internal_analog_ref->rx = value; - break; - - case PAD_R_DOWN: - case PAD_R_UP: - m_internal_analog_ref->ry = value; - break; - - case PAD_L_LEFT: - case PAD_L_RIGHT: - m_internal_analog_ref->lx = value; - break; - - case PAD_L_DOWN: - case PAD_L_UP: - m_internal_analog_ref->ly = value; - break; - - default: - break; - } -} - -bool KeyStatus::analog_is_reversed(u32 pad, u32 index) -{ - switch (index) - { - case PAD_L_RIGHT: - case PAD_L_LEFT: - return (g_conf.pad_options[pad].reverse_lx); - - case PAD_R_LEFT: - case PAD_R_RIGHT: - return (g_conf.pad_options[pad].reverse_rx); - - case PAD_L_UP: - case PAD_L_DOWN: - return (g_conf.pad_options[pad].reverse_ly); - - case PAD_R_DOWN: - case PAD_R_UP: - return (g_conf.pad_options[pad].reverse_ry); - - default: - return false; - } -} - -u8 KeyStatus::get(u32 pad, u32 index) -{ - switch (index) - { - case PAD_R_LEFT: - case PAD_R_RIGHT: - return m_analog[pad].rx; - - case PAD_R_DOWN: - case PAD_R_UP: - return m_analog[pad].ry; - - case PAD_L_LEFT: - case PAD_L_RIGHT: - return m_analog[pad].lx; - - case PAD_L_DOWN: - case PAD_L_UP: - return m_analog[pad].ly; - - default: - return m_button_pressure[pad][index]; - } -} - -u8 KeyStatus::analog_merge(u8 kbd, u8 joy) -{ - if (kbd != m_analog_released_val) - return kbd; - else - return joy; -} - -void KeyStatus::commit_status(u32 pad) -{ - m_button[pad] = m_internal_button_kbd[pad] & m_internal_button_joy[pad]; - - for (u32 index = 0; index < MAX_KEYS; index++) - m_button_pressure[pad][index] = m_internal_button_pressure[pad][index]; - - m_analog[pad].lx = analog_merge(m_internal_analog_kbd[pad].lx, m_internal_analog_joy[pad].lx); - m_analog[pad].ly = analog_merge(m_internal_analog_kbd[pad].ly, m_internal_analog_joy[pad].ly); - m_analog[pad].rx = analog_merge(m_internal_analog_kbd[pad].rx, m_internal_analog_joy[pad].rx); - m_analog[pad].ry = analog_merge(m_internal_analog_kbd[pad].ry, m_internal_analog_joy[pad].ry); -} diff --git a/pcsx2/PAD/Linux/KeyStatus.h b/pcsx2/PAD/Linux/KeyStatus.h deleted file mode 100644 index 2893beb558..0000000000 --- a/pcsx2/PAD/Linux/KeyStatus.h +++ /dev/null @@ -1,71 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "Global.h" - -typedef struct -{ - u8 lx, ly; - u8 rx, ry; -} PADAnalog; - -#define MAX_ANALOG_VALUE 32766 - -class KeyStatus -{ -private: - const u8 m_analog_released_val; - - u16 m_button[GAMEPAD_NUMBER]; - u16 m_internal_button_kbd[GAMEPAD_NUMBER]; - u16 m_internal_button_joy[GAMEPAD_NUMBER]; - - u8 m_button_pressure[GAMEPAD_NUMBER][MAX_KEYS]; - u8 m_internal_button_pressure[GAMEPAD_NUMBER][MAX_KEYS]; - - bool m_state_acces[GAMEPAD_NUMBER]; - - PADAnalog m_analog[GAMEPAD_NUMBER]; - PADAnalog m_internal_analog_kbd[GAMEPAD_NUMBER]; - PADAnalog m_internal_analog_joy[GAMEPAD_NUMBER]; - - void analog_set(u32 pad, u32 index, u8 value); - bool analog_is_reversed(u32 pad, u32 index); - u8 analog_merge(u8 kbd, u8 joy); - -public: - KeyStatus() - : m_analog_released_val(0x7F) - { - Init(); - } - void Init(); - - void keyboard_state_acces(u32 pad) { m_state_acces[pad] = true; } - void joystick_state_acces(u32 pad) { m_state_acces[pad] = false; } - - void press(u32 pad, u32 index, s32 value = 0xFF); - void release(u32 pad, u32 index); - - u16 get(u32 pad); - u8 get(u32 pad, u32 index); - - - void commit_status(u32 pad); -}; - -extern KeyStatus g_key_status; diff --git a/pcsx2/PAD/Linux/PAD.cpp b/pcsx2/PAD/Linux/PAD.cpp deleted file mode 100644 index 496766c455..0000000000 --- a/pcsx2/PAD/Linux/PAD.cpp +++ /dev/null @@ -1,294 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include -#include -#include -#include - -// NOTE: Must come first because of the None enum -#include "common/WindowInfo.h" - -#include "keyboard.h" -#include "../Gamepad.h" -#include "state_management.h" - -#if defined(__unix__) || defined(__APPLE__) -#include "Device.h" -#endif - -#ifdef __linux__ -#include -#endif - -#include "gui/AppCoreThread.h" -#include "wx_dialog/dialog.h" - -#ifndef __APPLE__ -Display* GSdsp = nullptr; -Window GSwin; -#endif - -const u32 revision = 3; -const u32 build = 0; // increase that with each version -#define PAD_SAVE_STATE_VERSION ((revision << 8) | (build << 0)) - -PADconf g_conf; -HostKeyEvent event; - -static HostKeyEvent s_event; -std::string s_padstrLogPath("logs/"); -#ifndef PCSX2_CORE -// PADclose is called from the core thread but PADupdate is called from the main thread -// I kind of hate this solution but it only needs to be here until we switch to Qt so whatever -static std::mutex s_pad_lock; -#endif - -KeyStatus g_key_status; - -MtQueue g_ev_fifo; - -s32 PADinit() -{ - PADLoadConfig(); - - Pad::reset_all(); - - query.reset(); - - for (int port = 0; port < 2; port++) - slots[port] = 0; - - return 0; -} - -void PADshutdown() -{ -} - -s32 PADopen(const WindowInfo& wi) -{ - memset(&event, 0, sizeof(event)); - g_key_status.Init(); - - g_ev_fifo.reset(); - -#if defined(__unix__) || defined(__APPLE__) - EnumerateDevices(); -#endif -#ifndef __APPLE__ - if (wi.type != WindowInfo::Type::X11) - return -1; - - GSdsp = static_cast(wi.display_connection); - GSwin = reinterpret_cast(wi.window_handle); -#endif - - return 0; -} - -void PADclose() -{ -#ifndef PCSX2_CORE - std::lock_guard guard(s_pad_lock); -#endif - device_manager.devices.clear(); -} - -s32 PADsetSlot(u8 port, u8 slot) -{ - port--; - slot--; - if (port > 1 || slot > 3) - { - return 0; - } - // Even if no pad there, record the slot, as it is the active slot regardless. - slots[port] = slot; - - return 1; -} - -s32 PADfreeze(FreezeAction mode, freezeData* data) -{ - if (!data) - return -1; - - if (mode == FreezeAction::Size) - { - data->size = sizeof(PadFullFreezeData); - } - else if (mode == FreezeAction::Load) - { - PadFullFreezeData* pdata = (PadFullFreezeData*)(data->data); - - Pad::stop_vibrate_all(); - - if (data->size != sizeof(PadFullFreezeData) || pdata->version != PAD_SAVE_STATE_VERSION || - strncmp(pdata->format, "LinPad", sizeof(pdata->format))) - return 0; - - query = pdata->query; - if (pdata->query.slot < 4) - { - query = pdata->query; - } - - // Tales of the Abyss - pad fix - // - restore data for both ports - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - u8 mode = pdata->padData[port][slot].mode; - - if (mode != MODE_DIGITAL && mode != MODE_ANALOG && mode != MODE_DS2_NATIVE) - { - break; - } - - memcpy(&pads[port][slot], &pdata->padData[port][slot], sizeof(PadFreezeData)); - } - - if (pdata->slot[port] < 4) - slots[port] = pdata->slot[port]; - } - } - else if (mode == FreezeAction::Save) - { - if (data->size != sizeof(PadFullFreezeData)) - return 0; - - PadFullFreezeData* pdata = (PadFullFreezeData*)(data->data); - - // Tales of the Abyss - pad fix - // - PCSX2 only saves port0 (save #1), then port1 (save #2) - - memset(pdata, 0, data->size); - strncpy(pdata->format, "LinPad", sizeof(pdata->format)); - pdata->version = PAD_SAVE_STATE_VERSION; - pdata->query = query; - - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - pdata->padData[port][slot] = pads[port][slot]; - } - - pdata->slot[port] = slots[port]; - } - } - else - { - return -1; - } - - return 0; -} - -u8 PADstartPoll(int port, int slot) -{ - return pad_start_poll(port, slot); -} - -u8 PADpoll(u8 value) -{ - return pad_poll(value); -} - -bool PADcomplete() -{ - return pad_complete(); -} - -// PADkeyEvent is called every vsync (return NULL if no event) -HostKeyEvent* PADkeyEvent() -{ -#ifdef SDL_BUILD - // Take the opportunity to handle hot plugging here - SDL_Event events; - while (SDL_PollEvent(&events)) - { - switch (events.type) - { - case SDL_CONTROLLERDEVICEADDED: - case SDL_CONTROLLERDEVICEREMOVED: - EnumerateDevices(); - break; - default: - break; - } - } -#endif -#if defined(__unix__) || defined(__APPLE__) - if (g_ev_fifo.size() == 0) - { - //PAD_LOG("No events in queue, returning empty event"); - s_event = event; - event.type = HostKeyEvent::Type::NoEvent; - event.key = 0; - return &s_event; - } - s_event = g_ev_fifo.dequeue(); - - AnalyzeKeyEvent(s_event); - //PAD_LOG("Returning Event. Event Type: %d, Key: %d", s_event.type, s_event.key); - return &s_event; -#endif -} - -#if defined(__unix__) || defined(__APPLE__) -void PADWriteEvent(HostKeyEvent& evt) -{ - // if (evt.evt != 6) { // Skip mouse move events for logging - // PAD_LOG("Pushing Event. Event Type: %d, Key: %d", evt.type, evt.key); - // } - g_ev_fifo.push(evt); -} -#endif - -void PADupdate(int pad) -{ -#ifndef __APPLE__ - // Gamepad inputs don't count as an activity. Therefore screensaver will - // be fired after a couple of minute. - // Emulate an user activity - static int count = 0; - count++; - if (GSdsp && (count & 0xFFF) == 0) - { - // 1 call every 4096 Vsync is enough - XResetScreenSaver(GSdsp); - } -#endif - -#ifndef PCSX2_CORE - std::lock_guard guard(s_pad_lock); -#endif - // Actually PADupdate is always call with pad == 0. So you need to update both - // pads -- Gregory - device_manager.Update(); -} - -void PADconfigure() -{ - ScopedCoreThreadPause paused_core; - PADLoadConfig(); - - DisplayDialog(); - paused_core.AllowResume(); - return; -} diff --git a/pcsx2/PAD/Linux/SDL/joystick.cpp b/pcsx2/PAD/Linux/SDL/joystick.cpp deleted file mode 100644 index 17f93ba174..0000000000 --- a/pcsx2/PAD/Linux/SDL/joystick.cpp +++ /dev/null @@ -1,261 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "joystick.h" -#include "Host.h" -#include // sigaction - -#if !SDL_VERSION_ATLEAST(2, 0, 9) - #error PCSX2 requires SDL2 2.0.9 or higher -#endif - -////////////////////////// -// Joystick definitions // -////////////////////////// - -// opens handles to all possible joysticks -void JoystickInfo::EnumerateJoysticks(std::vector>& vjoysticks) -{ - uint32_t flag = SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER; - - if ((SDL_WasInit(0) & flag) != flag) - { - // Tell SDL to catch event even if the windows isn't focussed - SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1"); - // Enable rumble on PS4 controllers (note: breaks DirectInput handling) - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); - // We want buttons to come in as positions, not labels, where possible - // New as of SDL 2.0.12, so use string - SDL_SetHint("SDL_GAMECONTROLLER_USE_BUTTON_LABELS", "0"); - // Super annoying to have a bright blue LED shining in your face all the time - // New as of SDL 2.0.18, so use string - SDL_SetHint("SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED", "0"); - // Enable Wii U Pro Controller support - // New as of SDL 2.26, so use string - SDL_SetHint("SDL_JOYSTICK_HIDAPI_WII", "1"); - - for (const auto& hint : g_conf.sdl2_hints) - SDL_SetHint(hint.first.c_str(), hint.second.c_str()); - - if (SDL_Init(flag) < 0) - return; - - // WTF! Give me back the control of my system - struct sigaction action = {}; - action.sa_handler = SIG_DFL; - sigaction(SIGINT, &action, nullptr); - sigaction(SIGTERM, &action, nullptr); - - SDL_JoystickEventState(SDL_QUERY); - SDL_GameControllerEventState(SDL_QUERY); - SDL_EventState(SDL_CONTROLLERDEVICEADDED, SDL_ENABLE); - SDL_EventState(SDL_CONTROLLERDEVICEREMOVED, SDL_ENABLE); - - { // Support as much Joystick as possible - auto file = Host::ReadResourceFile("game_controller_db.txt"); - if (file.has_value()) - SDL_GameControllerAddMappingsFromRW(SDL_RWFromMem(file->data(), file->size()), 1); - else - Console.Warning("Failed to load SDL Game Controller DB file!"); - - // Add user mapping too - for (auto const& map : g_conf.sdl2_mapping) - SDL_GameControllerAddMapping(map.c_str()); - } - } - - vjoysticks.clear(); - - for (int i = 0; i < SDL_NumJoysticks(); ++i) - { - vjoysticks.push_back(std::unique_ptr(new JoystickInfo(i))); - // Something goes wrong in the init, let's drop it - if (!vjoysticks.back()->IsProperlyInitialized()) - vjoysticks.pop_back(); - } -} - -void JoystickInfo::Rumble(unsigned type, unsigned pad) -{ - if (type >= std::size(m_rumble_end)) - return; - - if (!(g_conf.pad_options[pad].forcefeedback)) - return; - - m_rumble_enabled[type] = true; - m_rumble_end[type] = SDL_GetTicks() + 125; // 125ms feels quite near to original - UpdateRumble(true); -} - -void JoystickInfo::UpdateRumble(bool needs_update) -{ - u16 rumble_amt[2] = {0, 0}; - u32 rumble_time = 0; - - u32 now = SDL_GetTicks(); - for (size_t i = 0; i < std::size(m_rumble_end); i++) - { - s32 remaining = static_cast(m_rumble_end[i] - now); - if (m_rumble_enabled[i]) - { - if (remaining > 0) - { - rumble_amt[i] = std::min(g_conf.get_ff_intensity() * UINT16_MAX, UINT16_MAX); - rumble_time = std::max(rumble_time, static_cast(remaining)); - } - else - { - m_rumble_enabled[i] = false; - needs_update = true; - } - } - } - - if (needs_update) - SDL_GameControllerRumble(m_controller, rumble_amt[1], rumble_amt[0], rumble_time); -} - -JoystickInfo::~JoystickInfo() -{ - if (m_controller != nullptr) - { - SDL_GameControllerClose(m_controller); - } -} - -JoystickInfo::JoystickInfo(int id) - : Device() - , m_controller(nullptr) - , m_unique_id(0) -{ - SDL_Joystick* joy = nullptr; - // Values are hardcoded currently but it could be later extended to allow remapping of the buttons - m_pad_to_sdl[PAD_L2] = SDL_CONTROLLER_AXIS_TRIGGERLEFT; - m_pad_to_sdl[PAD_R2] = SDL_CONTROLLER_AXIS_TRIGGERRIGHT; - m_pad_to_sdl[PAD_L1] = SDL_CONTROLLER_BUTTON_LEFTSHOULDER; - m_pad_to_sdl[PAD_R1] = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER; - m_pad_to_sdl[PAD_TRIANGLE] = SDL_CONTROLLER_BUTTON_Y; - m_pad_to_sdl[PAD_CIRCLE] = SDL_CONTROLLER_BUTTON_B; - m_pad_to_sdl[PAD_CROSS] = SDL_CONTROLLER_BUTTON_A; - m_pad_to_sdl[PAD_SQUARE] = SDL_CONTROLLER_BUTTON_X; - m_pad_to_sdl[PAD_SELECT] = SDL_CONTROLLER_BUTTON_BACK; - m_pad_to_sdl[PAD_L3] = SDL_CONTROLLER_BUTTON_LEFTSTICK; - m_pad_to_sdl[PAD_R3] = SDL_CONTROLLER_BUTTON_RIGHTSTICK; - m_pad_to_sdl[PAD_START] = SDL_CONTROLLER_BUTTON_START; - m_pad_to_sdl[PAD_UP] = SDL_CONTROLLER_BUTTON_DPAD_UP; - m_pad_to_sdl[PAD_RIGHT] = SDL_CONTROLLER_BUTTON_DPAD_RIGHT; - m_pad_to_sdl[PAD_DOWN] = SDL_CONTROLLER_BUTTON_DPAD_DOWN; - m_pad_to_sdl[PAD_LEFT] = SDL_CONTROLLER_BUTTON_DPAD_LEFT; - m_pad_to_sdl[PAD_L_UP] = SDL_CONTROLLER_AXIS_LEFTY; - m_pad_to_sdl[PAD_L_RIGHT] = SDL_CONTROLLER_AXIS_LEFTX; - m_pad_to_sdl[PAD_L_DOWN] = SDL_CONTROLLER_AXIS_LEFTY; - m_pad_to_sdl[PAD_L_LEFT] = SDL_CONTROLLER_AXIS_LEFTX; - m_pad_to_sdl[PAD_R_UP] = SDL_CONTROLLER_AXIS_RIGHTY; - m_pad_to_sdl[PAD_R_RIGHT] = SDL_CONTROLLER_AXIS_RIGHTX; - m_pad_to_sdl[PAD_R_DOWN] = SDL_CONTROLLER_AXIS_RIGHTY; - m_pad_to_sdl[PAD_R_LEFT] = SDL_CONTROLLER_AXIS_RIGHTX; - - if (SDL_IsGameController(id)) - { - m_controller = SDL_GameControllerOpen(id); - joy = SDL_GameControllerGetJoystick(m_controller); - } - else - { - joy = SDL_JoystickOpen(id); - } - - if (joy == nullptr) - { - Console.Warning("PAD: failed to open joystick %d", id); - return; - } - - // Collect Device Information - char guid[64]; - SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), guid, 64); - m_device_name = SDL_JoystickNameForIndex(id); - - if (m_controller == nullptr) - { - Console.Warning("PAD: Joystick (%s,GUID:%s) isn't yet supported by the SDL2 game controller API\n" - "You can use SDL2 Gamepad Tool (https://www.generalarcade.com/gamepadtool/) or Steam to configure your joystick\n" - "The mapping can be stored in PAD.ini as 'SDL2 = <...mapping description...>'\n" - "Please post the new generated mapping to (https://github.com/gabomdq/SDL_GameControllerDB) so it can be added to the database.", - m_device_name.c_str(), guid); - - SDL_JoystickClose(joy); - - return; - } - - std::hash hash_me; - m_unique_id = hash_me(std::string(guid)); - - bool rumble_support = SDL_GameControllerRumble(m_controller, 0, 0, 1) >= 0; - - Console.WriteLn("PAD: controller (%s) detected%s, GUID:%s", - m_device_name.c_str(), rumble_support ? " with rumble support" : "", guid); - - m_no_error = true; -} - -const char* JoystickInfo::GetName() -{ - return SDL_JoystickName(SDL_GameControllerGetJoystick(m_controller)); -} - -size_t JoystickInfo::GetUniqueIdentifier() -{ - return m_unique_id; -} - -bool JoystickInfo::TestForce(float strength = 0.60) -{ - u16 u16strength = static_cast(UINT16_MAX * strength); - - return SDL_GameControllerRumble(m_controller, u16strength, u16strength, 400) >= 0; -} - -int JoystickInfo::GetInput(gamePadValues input) -{ - float k = g_conf.get_sensibility() / 100.0; // convert sensibility to float - - // Handle analog inputs which range from -32k to +32k. Range conversion is handled later in the controller - if (IsAnalogKey(input)) - { - int value = SDL_GameControllerGetAxis(m_controller, (SDL_GameControllerAxis)m_pad_to_sdl[input]); - value *= k; - return (abs(value) > m_deadzone) ? value : 0; - } - - // Handle triggers which range from 0 to +32k. They must be converted to 0-255 range - if (input == PAD_L2 || input == PAD_R2) - { - int value = SDL_GameControllerGetAxis(m_controller, (SDL_GameControllerAxis)m_pad_to_sdl[input]); - return (value > m_deadzone) ? value / 128 : 0; - } - - // Remain buttons - int value = SDL_GameControllerGetButton(m_controller, (SDL_GameControllerButton)m_pad_to_sdl[input]); - return value ? 0xFF : 0; // Max pressure -} - -void JoystickInfo::UpdateDeviceState() -{ - UpdateRumble(false); - SDL_GameControllerUpdate(); -} diff --git a/pcsx2/PAD/Linux/SDL/joystick.h b/pcsx2/PAD/Linux/SDL/joystick.h deleted file mode 100644 index 6755d9bd2c..0000000000 --- a/pcsx2/PAD/Linux/SDL/joystick.h +++ /dev/null @@ -1,59 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include - -#include "../Global.h" -#include "../Device.h" - -#define NB_EFFECT 2 // Don't use more than two, ps2 only has one for big motor and one for small(like most systems) - -// holds all joystick info -class JoystickInfo : public Device -{ -public: - JoystickInfo(int id); - ~JoystickInfo(); - - JoystickInfo(const JoystickInfo&) = delete; // copy constructor - JoystickInfo& operator=(const JoystickInfo&) = delete; // assignment - - - // opens handles to all possible joysticks - static void EnumerateJoysticks(std::vector>& vjoysticks); - - void Rumble(unsigned type, unsigned pad) override; - void UpdateRumble(bool needs_update); - - bool TestForce(float) override; - - const char* GetName() final; - - int GetInput(gamePadValues input) final; - - void UpdateDeviceState() final; - - size_t GetUniqueIdentifier() final; - -private: - SDL_GameController* m_controller; - u32 m_rumble_end[NB_EFFECT] = {}; - bool m_rumble_enabled[NB_EFFECT] = {}; - size_t m_unique_id; - std::array m_pad_to_sdl; -}; diff --git a/pcsx2/PAD/Linux/bitwise.h b/pcsx2/PAD/Linux/bitwise.h deleted file mode 100644 index a9a48169b7..0000000000 --- a/pcsx2/PAD/Linux/bitwise.h +++ /dev/null @@ -1,40 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -template -static void __forceinline set_bit(T& value, int bit) -{ - value |= (1 << bit); -} - -template -static void __forceinline clear_bit(T& value, int bit) -{ - value &= ~(1 << bit); -} - -template -static void __forceinline toggle_bit(T& value, int bit) -{ - value ^= (1 << bit); -} - -template -static bool __forceinline test_bit(T& value, int bit) -{ - return (value & (1 << bit)); -} diff --git a/pcsx2/PAD/Linux/keyboard.cpp b/pcsx2/PAD/Linux/keyboard.cpp deleted file mode 100644 index ce3c4baf15..0000000000 --- a/pcsx2/PAD/Linux/keyboard.cpp +++ /dev/null @@ -1,318 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -/* - * Theoretically, this header is for anything to do with keyboard input. - * Pragmatically, event handing's going in here too. - */ - -#include "Global.h" -#include "keyboard.h" -#include "../Gamepad.h" - -extern HostKeyEvent event; -extern MtQueue g_ev_fifo; - -/// g_key_status.press but with proper handling for analog buttons -static void PressButton(u32 pad, u32 button) -{ - // Analog controls. - if (IsAnalogKey(button)) - { - switch (button) - { - case PAD_R_LEFT: - case PAD_R_UP: - case PAD_L_LEFT: - case PAD_L_UP: - g_key_status.press(pad, button, -MAX_ANALOG_VALUE); - break; - case PAD_R_RIGHT: - case PAD_R_DOWN: - case PAD_L_RIGHT: - case PAD_L_DOWN: - g_key_status.press(pad, button, MAX_ANALOG_VALUE); - break; - } - } - else - { - g_key_status.press(pad, button); - } -} - -#if defined(__APPLE__) -// Mac keyboard input code is based on Dolphin's Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm -// Copyright 2016 Dolphin Emulator Project -// Licensed under GPLv2+ - -// All keycodes are 16 bits or less, so we use top 16 bits to differentiate source -// Keyboard keys use discriminator 0 -// Mouse buttons use discriminator 1 - -void UpdateKeyboardInput() -{ - g_ev_fifo.consume_all(AnalyzeKeyEvent); -} - -bool PollForNewKeyboardKeys(u32& pkey) -{ - // All keycodes in are 0x7e or lower. If you notice - // keys that aren't being recognized, bump this number up! - for (int key = 0; key < 0x80; key++) - { - if (CGEventSourceKeyState(kCGEventSourceStateHIDSystemState, key)) - { - pkey = key == kVK_Escape ? UINT32_MAX : key; - return true; - } - } -#define CHECK(button, value) \ - if (CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, (button))) \ - { \ - pkey = (value); \ - return true; \ - } - CHECK(kCGMouseButtonLeft, 0x10001) - CHECK(kCGMouseButtonCenter, 0x10002) - CHECK(kCGMouseButtonRight, 0x10003) -#undef CHECK - return false; -} -#elif defined(__unix__) -static bool s_grab_input = false; -static bool s_Shift = false; - -void UpdateKeyboardInput() -{ - HostKeyEvent evt = {}; - XEvent E = {0}; - - // Keyboard input send by PCSX2 - g_ev_fifo.consume_all(AnalyzeKeyEvent); - - // keyboard input - if (!GSdsp) - return; - - while (XPending(GSdsp) > 0) - { - XNextEvent(GSdsp, &E); - - // Change the format of the structure to be compatible with GSOpen2 - // mode (event come from pcsx2 not X) - evt.type = static_cast(E.type); - switch (E.type) - { - case MotionNotify: - evt.key = (E.xbutton.x & 0xFFFF) | (E.xbutton.y << 16); - evt.type = HostKeyEvent::Type::MouseMove; - break; - case ButtonRelease: - evt.key = E.xbutton.button | 0x10000; - evt.type = HostKeyEvent::Type::MouseReleased; - break; - case ButtonPress: - evt.key = E.xbutton.button | 0x10000; - evt.type = HostKeyEvent::Type::MousePressed; - break; - case KeyPress: - evt.key = (int)XLookupKeysym(&E.xkey, 0); - evt.type = HostKeyEvent::Type::KeyPressed; - break; - case KeyRelease: - evt.key = (int)XLookupKeysym(&E.xkey, 0); - evt.type = HostKeyEvent::Type::KeyReleased; - default: - continue; - } - - AnalyzeKeyEvent(evt); - } -} - -bool PollForNewKeyboardKeys(u32& pkey) -{ - GdkEvent* ev = gdk_event_get(); - - if (ev != NULL) - { - if (ev->type == GDK_KEY_PRESS) - { - pkey = ev->key.keyval != GDK_KEY_Escape ? ev->key.keyval : UINT32_MAX; - return true; - } - else if (ev->type == GDK_BUTTON_PRESS) - { - pkey = ev->button.button | 0x10000; - return true; - } - } - - return false; -} -#endif - -static unsigned int s_previous_mouse_x = 0; -static unsigned int s_previous_mouse_y = 0; - -void AnalyzeKeyEvent(HostKeyEvent& evt) -{ - int pad = 0; - int index = -1; - - for (u32 cpad = 0; cpad < GAMEPAD_NUMBER; cpad++) - { - int tmp_index = get_keyboard_key(cpad, evt.key); - if (tmp_index != -1) - { - pad = cpad; - index = tmp_index; - } - } - - switch (evt.type) - { - case HostKeyEvent::Type::KeyPressed: - // Shift F12 is not yet use by pcsx2. So keep it to grab/ungrab input - // I found it very handy vs the automatic fullscreen detection - // 1/ Does not need to detect full-screen - // 2/ Can use a debugger in full-screen - // 3/ Can grab input in window without the need of a pixelated full-screen -#ifdef __unix__ - if (evt.key == XK_Shift_R || evt.key == XK_Shift_L) - s_Shift = true; - if (evt.key == XK_F12 && s_Shift && GSdsp) - { - if (!s_grab_input) - { - s_grab_input = true; - XGrabPointer(GSdsp, GSwin, True, ButtonPressMask, GrabModeAsync, GrabModeAsync, GSwin, None, CurrentTime); - XGrabKeyboard(GSdsp, GSwin, True, GrabModeAsync, GrabModeAsync, CurrentTime); - } - else - { - s_grab_input = false; - XUngrabPointer(GSdsp, CurrentTime); - XUngrabKeyboard(GSdsp, CurrentTime); - } - } -#endif - - if (index != -1) - PressButton(pad, index); - - //PAD_LOG("Key pressed:%d", index); - - event.type = HostKeyEvent::Type::KeyPressed; - event.key = evt.key; - break; - - case HostKeyEvent::Type::KeyReleased: -#ifdef __unix__ - if (evt.key == XK_Shift_R || evt.key == XK_Shift_L) - s_Shift = false; -#endif - - if (index != -1) - g_key_status.release(pad, index); - - event.type = HostKeyEvent::Type::KeyReleased; - event.key = evt.key; - break; - - case HostKeyEvent::Type::FocusGained: - break; - - case HostKeyEvent::Type::FocustLost: -#ifdef __unix__ - s_Shift = false; -#endif - break; - - case HostKeyEvent::Type::MousePressed: - if (index != -1) - g_key_status.press(pad, index); - break; - - case HostKeyEvent::Type::MouseReleased: - if (index != -1) - g_key_status.release(pad, index); - break; - - case HostKeyEvent::Type::MouseMove: - // FIXME: How to handle when the mouse does not move, no event generated!!! - // 1/ small move == no move. Cons : can not do small movement - // 2/ use a watchdog timer thread - // 3/ ??? idea welcome ;) - if (g_conf.pad_options[pad].mouse_l | g_conf.pad_options[pad].mouse_r) - { - unsigned int pad_x; - unsigned int pad_y; - // Note when both PADOPTION_MOUSE_R and PADOPTION_MOUSE_L are set, take only the right one - if (g_conf.pad_options[pad].mouse_r) - { - pad_x = PAD_R_RIGHT; - pad_y = PAD_R_UP; - } - else - { - pad_x = PAD_L_RIGHT; - pad_y = PAD_L_UP; - } - - unsigned x = evt.key & 0xFFFF; - unsigned int value = (s_previous_mouse_x > x) ? s_previous_mouse_x - x : x - s_previous_mouse_x; - value *= g_conf.get_sensibility(); - - if (x == 0) - g_key_status.press(pad, pad_x, -MAX_ANALOG_VALUE); - else if (x == 0xFFFF) - g_key_status.press(pad, pad_x, MAX_ANALOG_VALUE); - else if (x < (s_previous_mouse_x - 2)) - g_key_status.press(pad, pad_x, -value); - else if (x > (s_previous_mouse_x + 2)) - g_key_status.press(pad, pad_x, value); - else - g_key_status.release(pad, pad_x); - - - unsigned y = evt.key >> 16; - value = (s_previous_mouse_y > y) ? s_previous_mouse_y - y : y - s_previous_mouse_y; - value *= g_conf.get_sensibility(); - - if (y == 0) - g_key_status.press(pad, pad_y, -MAX_ANALOG_VALUE); - else if (y == 0xFFFF) - g_key_status.press(pad, pad_y, MAX_ANALOG_VALUE); - else if (y < (s_previous_mouse_y - 2)) - g_key_status.press(pad, pad_y, -value); - else if (y > (s_previous_mouse_y + 2)) - g_key_status.press(pad, pad_y, value); - else - g_key_status.release(pad, pad_y); - - s_previous_mouse_x = x; - s_previous_mouse_y = y; - } - - break; - - case HostKeyEvent::Type::NoEvent: - case HostKeyEvent::Type::MouseWheelDown: - case HostKeyEvent::Type::MouseWheelUp: - break; - } -} diff --git a/pcsx2/PAD/Linux/keyboard.h b/pcsx2/PAD/Linux/keyboard.h deleted file mode 100644 index 3896a08bb0..0000000000 --- a/pcsx2/PAD/Linux/keyboard.h +++ /dev/null @@ -1,46 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "common/Pcsx2Defs.h" -#include "Host.h" - -#if defined(__unix__) || defined(__APPLE__) - -#ifndef __APPLE__ -#include -#include -#include - -// x11 is dumb like that -#undef DisableScreenSaver -#endif - -extern void AnalyzeKeyEvent(HostKeyEvent& evt); -extern void UpdateKeyboardInput(); -extern bool PollForNewKeyboardKeys(u32& pkey); -#endif - -#if defined(__unix__) -#include -#include - -extern Display* GSdsp; -extern Window GSwin; - -#elif defined(__APPLE__) -#include -#endif diff --git a/pcsx2/PAD/Linux/state_management.cpp b/pcsx2/PAD/Linux/state_management.cpp deleted file mode 100644 index 8cfc47c7a4..0000000000 --- a/pcsx2/PAD/Linux/state_management.cpp +++ /dev/null @@ -1,484 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "state_management.h" -#include "Device.h" - -// Typical packet response on the bus -static const u8 ConfigExit[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const u8 noclue[7] = {0x5A, 0x00, 0x00, 0x02, 0x00, 0x00, 0x5A}; -static const u8 setMode[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const u8 queryModelDS2[7] = {0x5A, 0x03, 0x02, 0x00, 0x02, 0x01, 0x00}; -static const u8 queryModelDS1[7] = {0x5A, 0x01, 0x02, 0x00, 0x02, 0x01, 0x00}; -static const u8 queryComb[7] = {0x5A, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00}; -static const u8 queryMode[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const u8 setNativeMode[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A}; - -static u8 queryMaskMode[7] = {0x5A, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x5A}; - -static const u8 queryAct[2][7] = { - {0x5A, 0x00, 0x00, 0x01, 0x02, 0x00, 0x0A}, - {0x5A, 0x00, 0x00, 0x01, 0x01, 0x01, 0x14}}; - -QueryInfo query; -Pad pads[2][4]; -int slots[2] = {0, 0}; - -////////////////////////////////////////////////////////////////////// -// QueryInfo implementation -////////////////////////////////////////////////////////////////////// - -void QueryInfo::reset() -{ - port = 0; - slot = 0; - lastByte = 1; - currentCommand = 0; - numBytes = 0; - queryDone = 1; - memset(response, 0xF3, sizeof(response)); -} - -u8 QueryInfo::start_poll(int _port, int _slot) -{ - if (port > 1) - { - reset(); - return 0; - } - - queryDone = 0; - port = _port; - slot = _slot; - numBytes = 2; - lastByte = 0; - - return 0xFF; -} - -////////////////////////////////////////////////////////////////////// -// Pad implementation -////////////////////////////////////////////////////////////////////// - -void Pad::set_mode(int _mode) -{ - mode = _mode; -} - -void Pad::set_vibrate(int motor, u8 val) -{ - nextVibrate[motor] = val; -} - -void Pad::reset_vibrate() -{ - set_vibrate(0, 0); - set_vibrate(1, 0); - memset(vibrate, 0xFF, sizeof(vibrate)); - vibrate[0] = 0x5A; -} - -void Pad::reset() -{ - memset(this, 0, sizeof(PadFreezeData)); - - set_mode(MODE_DIGITAL); - umask[0] = 0xFF; - umask[1] = 0xFF; - umask[2] = 0x03; - - // Sets up vibrate variable. - reset_vibrate(); -} - -void Pad::rumble(unsigned port) -{ - for (unsigned motor = 0; motor < 2; motor++) - { - // TODO: Probably be better to send all of these at once. - if (nextVibrate[motor] | currentVibrate[motor]) - { - currentVibrate[motor] = nextVibrate[motor]; - - Device::DoRumble(motor, port); - } - } -} - -void Pad::stop_vibrate_all() -{ -#if 0 - for (int i=0; i<8; i++) { - SetVibrate(i&1, i>>1, 0, 0); - SetVibrate(i&1, i>>1, 1, 0); - } -#endif - // FIXME equivalent ? - for (int port = 0; port < 2; port++) - for (int slot = 0; slot < 4; slot++) - pads[port][slot].reset_vibrate(); -} - -void Pad::reset_all() -{ - for (int port = 0; port < 2; port++) - for (int slot = 0; slot < 4; slot++) - pads[port][slot].reset(); -} - -void Pad::rumble_all() -{ - for (unsigned port = 0; port < 2; port++) - for (unsigned slot = 0; slot < 4; slot++) - pads[port][slot].rumble(port); -} - -////////////////////////////////////////////////////////////////////// -// Pad implementation -////////////////////////////////////////////////////////////////////// - -inline bool IsDualshock2() -{ -// FIXME -#if 0 - return config.padConfigs[query.port][query.slot].type == Dualshock2Pad || - (config.padConfigs[query.port][query.slot].type == GuitarPad && config.GH2); -#else - return true; -#endif -} - -u8 pad_start_poll(u8 port, u8 slot) -{ - return query.start_poll(port, slot); -} - -bool pad_complete() -{ - return query.queryDone; -} - -u8 pad_poll(u8 value) -{ - if (query.lastByte + 1 >= query.numBytes) - { - return 0; - } - if (query.lastByte && query.queryDone) - { - return query.response[++query.lastByte]; - } - - Pad* pad = &pads[query.port][query.slot]; - - if (query.lastByte == 0) - { - query.lastByte++; - query.currentCommand = value; - - switch (value) - { - case CMD_CONFIG_MODE: - if (pad->config) - { - // In config mode. Might not actually be leaving it. - query.set_result(ConfigExit); - return 0xF3; - } - [[fallthrough]]; // fallthrough on purpose (but I don't know why) - - case CMD_READ_DATA_AND_VIBRATE: - { - query.response[2] = 0x5A; -#if 0 - int i; - Update(query.port, query.slot); - ButtonSum *sum = &pad->sum; - - u8 b1 = 0xFF, b2 = 0xFF; - for (i = 0; i<4; i++) { - b1 -= (sum->buttons[i] > 0) << i; - } - for (i = 0; i<8; i++) { - b2 -= (sum->buttons[i+4] > 0) << i; - } -#endif - -// FIXME -#if 0 - if (config.padConfigs[query.port][query.slot].type == GuitarPad && !config.GH2) { - sum->buttons[15] = 255; - // Not sure about this. Forces wammy to be from 0 to 0x7F. - // if (sum->sticks[2].vert > 0) sum->sticks[2].vert = 0; - } -#endif - -#if 0 - for (i = 4; i<8; i++) { - b1 -= (sum->buttons[i+8] > 0) << i; - } -#endif - -// FIXME -#if 0 - //Left, Right and Down are always pressed on Pop'n Music controller. - if (config.padConfigs[query.port][query.slot].type == PopnPad) - b1=b1 & 0x1f; -#endif - - uint16_t buttons = g_key_status.get(query.port); - - query.numBytes = 5; - - query.response[3] = (buttons >> 8) & 0xFF; - query.response[4] = (buttons >> 0) & 0xFF; - - if (pad->mode != MODE_DIGITAL) - { // ANALOG || DS2 native - query.numBytes = 9; - - query.response[5] = g_key_status.get(query.port, PAD_R_RIGHT); - query.response[6] = g_key_status.get(query.port, PAD_R_UP); - query.response[7] = g_key_status.get(query.port, PAD_L_RIGHT); - query.response[8] = g_key_status.get(query.port, PAD_L_UP); - - if (pad->mode != MODE_ANALOG) - { // DS2 native - query.numBytes = 21; - - query.response[9] = !test_bit(buttons, 13) ? g_key_status.get(query.port, PAD_RIGHT) : 0; - query.response[10] = !test_bit(buttons, 15) ? g_key_status.get(query.port, PAD_LEFT) : 0; - query.response[11] = !test_bit(buttons, 12) ? g_key_status.get(query.port, PAD_UP) : 0; - query.response[12] = !test_bit(buttons, 14) ? g_key_status.get(query.port, PAD_DOWN) : 0; - - query.response[13] = !test_bit(buttons, 4) ? g_key_status.get(query.port, PAD_TRIANGLE) : 0; - query.response[14] = !test_bit(buttons, 5) ? g_key_status.get(query.port, PAD_CIRCLE) : 0; - query.response[15] = !test_bit(buttons, 6) ? g_key_status.get(query.port, PAD_CROSS) : 0; - query.response[16] = !test_bit(buttons, 7) ? g_key_status.get(query.port, PAD_SQUARE) : 0; - query.response[17] = !test_bit(buttons, 2) ? g_key_status.get(query.port, PAD_L1) : 0; - query.response[18] = !test_bit(buttons, 3) ? g_key_status.get(query.port, PAD_R1) : 0; - query.response[19] = !test_bit(buttons, 0) ? g_key_status.get(query.port, PAD_L2) : 0; - query.response[20] = !test_bit(buttons, 1) ? g_key_status.get(query.port, PAD_R2) : 0; - } - } - -#if 0 - query.response[3] = b1; - query.response[4] = b2; - - query.numBytes = 5; - if (pad->mode != MODE_DIGITAL) { - query.response[5] = Cap((sum->sticks[0].horiz+255)/2); - query.response[6] = Cap((sum->sticks[0].vert+255)/2); - query.response[7] = Cap((sum->sticks[1].horiz+255)/2); - query.response[8] = Cap((sum->sticks[1].vert+255)/2); - - query.numBytes = 9; - if (pad->mode != MODE_ANALOG) { - // Good idea? No clue. - //query.response[3] &= pad->mask[0]; - //query.response[4] &= pad->mask[1]; - - // No need to cap these, already done int CapSum(). - query.response[9] = (unsigned char)sum->buttons[13]; //D-pad right - query.response[10] = (unsigned char)sum->buttons[15]; //D-pad left - query.response[11] = (unsigned char)sum->buttons[12]; //D-pad up - query.response[12] = (unsigned char)sum->buttons[14]; //D-pad down - - query.response[13] = (unsigned char) sum->buttons[8]; - query.response[14] = (unsigned char) sum->buttons[9]; - query.response[15] = (unsigned char) sum->buttons[10]; - query.response[16] = (unsigned char) sum->buttons[11]; - query.response[17] = (unsigned char) sum->buttons[6]; - query.response[18] = (unsigned char) sum->buttons[7]; - query.response[19] = (unsigned char) sum->buttons[4]; - query.response[20] = (unsigned char) sum->buttons[5]; - query.numBytes = 21; - } - } -#endif - } - - query.lastByte = 1; - return pad->mode; - - case CMD_SET_VREF_PARAM: - query.set_final_result(noclue); - break; - - case CMD_QUERY_DS2_ANALOG_MODE: - // Right? Wrong? No clue. - if (pad->mode == MODE_DIGITAL) - { - queryMaskMode[1] = queryMaskMode[2] = queryMaskMode[3] = 0; - queryMaskMode[6] = 0x00; - } - else - { - queryMaskMode[1] = pad->umask[0]; - queryMaskMode[2] = pad->umask[1]; - queryMaskMode[3] = pad->umask[2]; - // Not entirely sure about this. - //queryMaskMode[3] = 0x01 | (pad->mode == MODE_DS2_NATIVE)*2; - queryMaskMode[6] = 0x5A; - } - query.set_final_result(queryMaskMode); - break; - - case CMD_SET_MODE_AND_LOCK: - query.set_result(setMode); - pad->reset_vibrate(); - break; - - case CMD_QUERY_MODEL_AND_MODE: - if (IsDualshock2()) - { - query.set_final_result(queryModelDS2); - } - else - { - query.set_final_result(queryModelDS1); - } - // Not digital mode. - query.response[5] = (pad->mode & 0xF) != 1; - break; - - case CMD_QUERY_ACT: - query.set_result(queryAct[0]); - break; - - case CMD_QUERY_COMB: - query.set_final_result(queryComb); - break; - - case CMD_QUERY_MODE: - query.set_result(queryMode); - break; - - case CMD_VIBRATION_TOGGLE: - memcpy(query.response + 2, pad->vibrate, 7); - query.numBytes = 9; - //query.set_result(pad->vibrate); // warning copy 7b not 8 (but it is really important?) - pad->reset_vibrate(); - break; - - case CMD_SET_DS2_NATIVE_MODE: - if (IsDualshock2()) - { - query.set_result(setNativeMode); - } - else - { - query.set_final_result(setNativeMode); - } - break; - - default: - query.numBytes = 0; - query.queryDone = 1; - break; - } - - return 0xF3; - } - else - { - query.lastByte++; - - switch (query.currentCommand) - { - case CMD_READ_DATA_AND_VIBRATE: - if (query.lastByte == pad->vibrateI[0]) - pad->set_vibrate(1, 255 * (value & 1)); - else if (query.lastByte == pad->vibrateI[1]) - pad->set_vibrate(0, value); - - break; - - case CMD_CONFIG_MODE: - if (query.lastByte == 3) - { - query.queryDone = 1; - pad->config = value; - } - break; - - case CMD_SET_MODE_AND_LOCK: - if (query.lastByte == 3 && value < 2) - { - pad->set_mode(value ? MODE_ANALOG : MODE_DIGITAL); - } - else if (query.lastByte == 4) - { - if (value == 3) - pad->modeLock = 3; - else - pad->modeLock = 0; - - query.queryDone = 1; - } - break; - - case CMD_QUERY_ACT: - if (query.lastByte == 3) - { - if (value < 2) - query.set_result(queryAct[value]); - // bunch of 0's - // else query.set_result(setMode); - query.queryDone = 1; - } - break; - - case CMD_QUERY_MODE: - if (query.lastByte == 3 && value < 2) - { - query.response[6] = 4 + value * 3; - query.queryDone = 1; - } - // bunch of 0's - //else data = setMode; - break; - - case CMD_VIBRATION_TOGGLE: - if (query.lastByte >= 3) - { - if (value == 0) - { - pad->vibrateI[0] = (u8)query.lastByte; - } - else if (value == 1) - { - pad->vibrateI[1] = (u8)query.lastByte; - } - pad->vibrate[query.lastByte - 2] = value; - } - break; - - case CMD_SET_DS2_NATIVE_MODE: - if (query.lastByte > 2 && query.lastByte < 6) - { - pad->umask[query.lastByte - 3] = value; - } - pad->set_mode(MODE_DS2_NATIVE); - break; - - default: - return 0; - } - - return query.response[query.lastByte]; - } -} diff --git a/pcsx2/PAD/Linux/state_management.h b/pcsx2/PAD/Linux/state_management.h deleted file mode 100644 index 005c554d37..0000000000 --- a/pcsx2/PAD/Linux/state_management.h +++ /dev/null @@ -1,134 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "Global.h" - -#define MODE_DIGITAL 0x41 -#define MODE_ANALOG 0x73 -#define MODE_DS2_NATIVE 0x79 - -enum PadCommands -{ - CMD_SET_VREF_PARAM = 0x40, - CMD_QUERY_DS2_ANALOG_MODE = 0x41, - CMD_READ_DATA_AND_VIBRATE = 0x42, - CMD_CONFIG_MODE = 0x43, - CMD_SET_MODE_AND_LOCK = 0x44, - CMD_QUERY_MODEL_AND_MODE = 0x45, - CMD_QUERY_ACT = 0x46, // ?? - CMD_QUERY_COMB = 0x47, // ?? - CMD_QUERY_MODE = 0x4C, // QUERY_MODE ?? - CMD_VIBRATION_TOGGLE = 0x4D, - CMD_SET_DS2_NATIVE_MODE = 0x4F // SET_DS2_NATIVE_MODE -}; - -// The state of the PS2 bus -struct QueryInfo -{ - u8 port; - u8 slot; - u8 lastByte; - u8 currentCommand; - u8 numBytes; - u8 queryDone; - u8 response[42]; - - void reset(); - u8 start_poll(int port, int slot); - - template - void set_result(const u8 (&rsp)[S]) - { - memcpy(response + 2, rsp, S); - numBytes = 2 + S; - } - - template - void set_final_result(const u8 (&rsp)[S]) - { - set_result(rsp); - queryDone = 1; - } -}; - -// Freeze data, for a single pad. Basically has all pad state that -// a PS2 can set. -struct PadFreezeData -{ - // Digital / Analog / DS2 Native - u8 mode; - - u8 modeLock; - - // In config mode - u8 config; - - u8 vibrate[8]; - u8 umask[3]; - - // Vibration indices. - u8 vibrateI[2]; - - // Last vibration value sent to controller. - // Only used so as not to call vibration - // functions when old and new values are both 0. - u8 currentVibrate[2]; - - // Next vibrate val to send to controller. If next and current are - // both 0, nothing is sent to the controller. Otherwise, it's sent - // on every update. - u8 nextVibrate[2]; -}; - -class Pad : public PadFreezeData -{ -public: - // Lilypad store here the state of PC pad - - void rumble(unsigned port); - void set_vibrate(int motor, u8 val); - void reset_vibrate(); - void reset(); - - void set_mode(int mode); - - static void reset_all(); - static void stop_vibrate_all(); - static void rumble_all(); -}; - -// Full state to manage save state -struct PadFullFreezeData -{ - char format[8]; - u32 version; - // active slot for port - u8 slot[2]; - PadFreezeData padData[2][4]; - QueryInfo query; - // unused padding data, present only so that data size - // matches Windows version for cross-platform save/load - char padding[8]; -}; - -extern QueryInfo query; -extern Pad pads[2][4]; -extern int slots[2]; - -extern u8 pad_start_poll(u8 port, u8 slot); -extern u8 pad_poll(u8 value); -extern bool pad_complete(); diff --git a/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp b/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp deleted file mode 100644 index d32d0a6b1c..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "GamepadConfiguration.h" - -GamepadConfiguration::GamepadConfiguration(int pad, wxWindow* parent) - : wxDialog(parent, wxID_ANY, _T("Gamepad"), wxDefaultPosition, wxDefaultSize, - wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN) - , m_pad_id(pad) - -{ - wxBoxSizer* gamepad_box = new wxBoxSizer(wxVERTICAL); - - wxArrayString choices; - for (const auto& j : device_manager.devices) - { - choices.Add(j->GetName()); - } - - m_joy_map = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices); - m_cb_rumble = new wxCheckBox(this, enable_rumble_id, _T("&Enable rumble")); - - wxStaticBoxSizer* rumble_box = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Rumble intensity")); - m_sl_rumble_intensity = new wxSlider(this, rumble_slider_id, 0, 0, 0x7FFF, wxDefaultPosition, wxDefaultSize, - wxSL_HORIZONTAL | wxSL_LABELS | wxSL_BOTTOM); - - wxStaticBoxSizer* joy_box = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Joystick sensibility")); - m_sl_joystick_sensibility = new wxSlider(this, joy_slider_id, 0, 0, 200, wxDefaultPosition, wxDefaultSize, - wxSL_HORIZONTAL | wxSL_LABELS | wxSL_BOTTOM); - - gamepad_box->Add(m_joy_map, wxSizerFlags().Expand().Border(wxALL, 5)); - gamepad_box->Add(m_cb_rumble, wxSizerFlags().Expand()); - - rumble_box->Add(m_sl_rumble_intensity, wxSizerFlags().Expand().Border(wxALL, 5)); - joy_box->Add(m_sl_joystick_sensibility, wxSizerFlags().Expand().Border(wxALL, 5)); - - gamepad_box->Add(rumble_box, wxSizerFlags().Expand().Border(wxALL, 5)); - gamepad_box->Add(joy_box, wxSizerFlags().Expand().Border(wxALL, 5)); - - Bind(wxEVT_UPDATE_UI, &GamepadConfiguration::OnUpdateEvent, this); - Bind(wxEVT_SCROLL_THUMBRELEASE, &GamepadConfiguration::OnSliderReleased, this); - Bind(wxEVT_CHECKBOX, &GamepadConfiguration::OnCheckboxChange, this); - Bind(wxEVT_CHOICE, &GamepadConfiguration::OnChoiceChange, this); - - repopulate(); - - SetSizerAndFit(gamepad_box); -} - -/** - * Initialize the frame - * Check if a gamepad is detected - * Check if the gamepad support rumbles - */ -void GamepadConfiguration::InitGamepadConfiguration() -{ - repopulate(); // Set label and fit simulated key array - /* - * Check if there exist at least one pad available - * if the pad id is 0, you need at least 1 gamepad connected, - * if the pad id is 1, you need at least 2 gamepads connected, - * Prevent to use a non-initialized value (core dump) - */ - if (device_manager.devices.size() >= m_pad_id + 1) - { - /* - * Determine if the device can use rumble - * Use TestForce with a very low strength (can't be felt) - * May be better to create a new function in order to check only that - */ - - // Bad idea. Some connected devices might support rumble but not all connected devices. - // if (!device_manager.devices[m_pad_id]->TestForce(0.001f)) { - // wxMessageBox(L"Rumble is not available for your device."); - // m_cb_rumble->Disable(); // disable the rumble checkbox - // m_sl_rumble_intensity->Disable(); // disable the rumble intensity slider - // } - } - else - { - wxMessageBox(L"No gamepad detected."); - m_sl_joystick_sensibility->Disable(); // disable the joystick sensibility slider - m_cb_rumble->Disable(); // disable the rumble checkbox - m_sl_rumble_intensity->Disable(); // disable the rumble intensity slider - } -} - -void GamepadConfiguration::OnUpdateEvent(wxCommandEvent& event) -{ - // Makes sure joystick rumble testing works properly - SDL_GameControllerUpdate(); -} - -/** - * Slider event, called when the use release the slider button - * @FIXME The current solution can't change the joystick sensibility and the rumble intensity - * for a specific gamepad. The same value is used for both - */ -void GamepadConfiguration::OnSliderReleased(wxCommandEvent& event) -{ - wxSlider* sl_tmp = (wxSlider*)event.GetEventObject(); - int sl_id = sl_tmp->GetId(); - if (!sl_tmp->IsEnabled()) // wxCocoa sends events even when the button is disabled - return; - - if (sl_id == rumble_slider_id) - { - float value = static_cast(m_sl_rumble_intensity->GetValue()) / 0x7FFF; - g_conf.set_ff_intensity(value); - - // convert in a float value between 0 and 1, and run rumble feedback. - // 0 to 1 scales to 0x0 to 0x7FFF - device_manager.devices[m_pad_id]->TestForce(value); - } - else if (sl_id == joy_slider_id) - { - g_conf.set_sensibility(m_sl_joystick_sensibility->GetValue()); - } -} - -/** - * Checkbox event, called when the value of the checkbox change - */ -void GamepadConfiguration::OnCheckboxChange(wxCommandEvent& event) -{ - wxCheckBox* cb_tmp = (wxCheckBox*)event.GetEventObject(); // get the slider object - int cb_id = cb_tmp->GetId(); - - if (cb_id == enable_rumble_id) - { - g_conf.pad_options[m_pad_id].forcefeedback = (m_cb_rumble->GetValue()) ? (u32)1 : (u32)0; - if (m_cb_rumble->GetValue()) - { - device_manager.devices[m_pad_id]->TestForce(); - m_sl_rumble_intensity->Enable(); - } - else - { - m_sl_rumble_intensity->Disable(); - } - } -} - -/** - * Checkbox event, called when the value of the choice box change - */ -void GamepadConfiguration::OnChoiceChange(wxCommandEvent& event) -{ - wxChoice* choice_tmp = (wxChoice*)event.GetEventObject(); - int id = choice_tmp->GetSelection(); - if (id != wxNOT_FOUND) - { - g_conf.set_joy_uid(m_pad_id, Device::index_to_uid(id)); - } -} - -/****************************************/ -/*********** Methods functions **********/ -/****************************************/ - -// Set button values -void GamepadConfiguration::repopulate() -{ - m_cb_rumble->SetValue(g_conf.pad_options[m_pad_id].forcefeedback); - - m_sl_rumble_intensity->SetValue(g_conf.get_ff_intensity() * 0x7FFF); - m_sl_joystick_sensibility->SetValue(g_conf.get_sensibility()); - - u32 joyid = Device::uid_to_index(m_pad_id); - if (joyid < m_joy_map->GetCount() && !m_joy_map->IsEmpty()) - m_joy_map->SetSelection(joyid); - - // enable rumble intensity slider if the checkbox is checked - m_sl_rumble_intensity->Enable(m_cb_rumble->GetValue()); -} diff --git a/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.h b/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.h deleted file mode 100644 index 57bc5a2850..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.h +++ /dev/null @@ -1,48 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - -#include "../Device.h" -#include "../keyboard.h" -#include "../Global.h" - -static const s32 rumble_slider_id = wxID_HIGHEST + 200 + 1; -static const s32 joy_slider_id = wxID_HIGHEST + 200 + 2; -static const s32 enable_rumble_id = wxID_HIGHEST + 200 + 3; - -class GamepadConfiguration : public wxDialog -{ - wxCheckBox* m_cb_rumble; - wxSlider *m_sl_rumble_intensity, *m_sl_joystick_sensibility; - wxChoice* m_joy_map; - - u32 m_pad_id; - - // Methods - void repopulate(); - - // Events - void OnUpdateEvent(wxCommandEvent&); - void OnSliderReleased(wxCommandEvent&); - void OnCheckboxChange(wxCommandEvent&); - void OnChoiceChange(wxCommandEvent&); - -public: - GamepadConfiguration(int, wxWindow*); - void InitGamepadConfiguration(); -}; diff --git a/pcsx2/PAD/Linux/wx_dialog/JoystickConfiguration.cpp b/pcsx2/PAD/Linux/wx_dialog/JoystickConfiguration.cpp deleted file mode 100644 index d6404f2726..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/JoystickConfiguration.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "JoystickConfiguration.h" - -static const s32 x_check_id = wxID_HIGHEST + 100 + 1; -static const s32 y_check_id = wxID_HIGHEST + 100 + 2; -static const s32 joy_check_id = wxID_HIGHEST + 100 + 3; - -// Constructor of JoystickConfiguration -JoystickConfiguration::JoystickConfiguration(int pad, bool left, wxWindow* parent) - : wxDialog(parent, wxID_ANY, _T("Joystick configuration"), wxDefaultPosition, wxDefaultSize, - wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN) - , m_pad_id(pad) -{ - m_isForLeftJoystick = left; - - wxBoxSizer* joy_conf_box = new wxBoxSizer(wxVERTICAL); - - if (m_isForLeftJoystick) - { - m_cb_reverse_x = new wxCheckBox(this, x_check_id, _T("Reverse Lx")); - m_cb_reverse_y = new wxCheckBox(this, y_check_id, _T("Reverse Ly")); - m_cb_mouse_joy = new wxCheckBox(this, joy_check_id, _T("Use mouse for left analog joystick")); - } - else - { - m_cb_reverse_x = new wxCheckBox(this, x_check_id, _T("Reverse Rx")); - m_cb_reverse_y = new wxCheckBox(this, y_check_id, _T("Reverse Ry")); - m_cb_mouse_joy = new wxCheckBox(this, joy_check_id, _T("Use mouse for right analog joystick")); - } - - joy_conf_box->Add(m_cb_reverse_x, wxSizerFlags().Expand().Border(wxLEFT | wxRIGHT, 5)); - joy_conf_box->Add(m_cb_reverse_y, wxSizerFlags().Expand().Border(wxLEFT | wxRIGHT, 5)); - joy_conf_box->Add(m_cb_mouse_joy, wxSizerFlags().Expand().Border(wxLEFT | wxRIGHT, 5)); - - Bind(wxEVT_CHECKBOX, &JoystickConfiguration::OnCheckboxChange, this); - - SetSizerAndFit(joy_conf_box); -} - -/** - * Initialize the frame - * Check if a gamepad is detected - */ -void JoystickConfiguration::InitJoystickConfiguration() -{ - repopulate(); // Set label and fit simulated key array - /* - * Check if there exist at least one pad available - * if the pad id is 0, you need at least 1 gamepad connected, - * if the pad id is 1, you need at least 2 gamepads connected, - * Prevent using a non-initialized value (core dump) - */ - if (device_manager.devices.size() < m_pad_id + 1) - { - if (device_manager.devices.empty()) - wxMessageBox(L"No gamepad detected."); - else - wxMessageBox(L"No second gamepad detected."); - - // disable all checkboxes - m_cb_reverse_y->Disable(); - m_cb_reverse_x->Disable(); - } -} - -/** - * Checkbox event, called when the value of the checkbox change - */ -void JoystickConfiguration::OnCheckboxChange(wxCommandEvent& event) -{ - wxCheckBox* cb_tmp = (wxCheckBox*)event.GetEventObject(); // get the slider object - int cb_id = cb_tmp->GetId(); - - if (m_isForLeftJoystick) - { - switch (cb_id) - { - case x_check_id: - g_conf.pad_options[m_pad_id].reverse_lx = m_cb_reverse_x->GetValue(); - break; - - case y_check_id: - g_conf.pad_options[m_pad_id].reverse_ly = m_cb_reverse_y->GetValue(); - break; - - case joy_check_id: - g_conf.pad_options[m_pad_id].mouse_l = m_cb_mouse_joy->GetValue(); - break; - - default: - break; - } - } - else - { - switch (cb_id) - { - case x_check_id: - g_conf.pad_options[m_pad_id].reverse_rx = m_cb_reverse_x->GetValue(); - break; - - case y_check_id: - g_conf.pad_options[m_pad_id].reverse_ry = m_cb_reverse_y->GetValue(); - break; - - case joy_check_id: - g_conf.pad_options[m_pad_id].mouse_r = m_cb_mouse_joy->GetValue(); - break; - - default: - break; - } - } -} - -/****************************************/ -/*********** Methods functions **********/ -/****************************************/ - -// Set button values -void JoystickConfiguration::repopulate() -{ - if (m_isForLeftJoystick) - { - m_cb_reverse_x->SetValue(g_conf.pad_options[m_pad_id].reverse_lx); - m_cb_reverse_y->SetValue(g_conf.pad_options[m_pad_id].reverse_ly); - m_cb_mouse_joy->SetValue(g_conf.pad_options[m_pad_id].mouse_l); - } - else - { - m_cb_reverse_x->SetValue(g_conf.pad_options[m_pad_id].reverse_rx); - m_cb_reverse_y->SetValue(g_conf.pad_options[m_pad_id].reverse_ry); - m_cb_mouse_joy->SetValue(g_conf.pad_options[m_pad_id].mouse_r); - } -} diff --git a/pcsx2/PAD/Linux/wx_dialog/JoystickConfiguration.h b/pcsx2/PAD/Linux/wx_dialog/JoystickConfiguration.h deleted file mode 100644 index d5cb3371bf..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/JoystickConfiguration.h +++ /dev/null @@ -1,42 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - -#include "../Global.h" -#include "../Device.h" -#include "../keyboard.h" - -class JoystickConfiguration : public wxDialog -{ - wxCheckBox *m_cb_reverse_x, *m_cb_reverse_y, - *m_cb_mouse_joy; // Use mouse for joystick - - u32 m_pad_id; - // isForLeftJoystick -> true is for Left Joystick, false is for Right Joystick - bool m_isForLeftJoystick; - - // Methods - void repopulate(); - - // Events - void OnCheckboxChange(wxCommandEvent&); - -public: - JoystickConfiguration(int, bool, wxWindow*); - void InitJoystickConfiguration(); -}; diff --git a/pcsx2/PAD/Linux/wx_dialog/dialog.cpp b/pcsx2/PAD/Linux/wx_dialog/dialog.cpp deleted file mode 100644 index 302c601667..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/dialog.cpp +++ /dev/null @@ -1,684 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "dialog.h" - -#ifdef __APPLE__ -#include - -static std::string KeyName(int pad, int key, int keysym) -{ - // Mouse - if (keysym >> 16) - { - switch (keysym & 0xFFFF) - { - case 0: - return "Mouse ???"; - case 1: - return "Mouse Left"; - case 2: - return "Mouse Middle"; - case 3: - return "Mouse Right"; - default: // Use only number for extra button - return "Mouse " + std::to_string((keysym & 0xFFFF) + 1); - } - } - - - // clang-format off - switch (keysym) - { - case kVK_ANSI_A: return "A"; - case kVK_ANSI_B: return "B"; - case kVK_ANSI_C: return "C"; - case kVK_ANSI_D: return "D"; - case kVK_ANSI_E: return "E"; - case kVK_ANSI_F: return "F"; - case kVK_ANSI_G: return "G"; - case kVK_ANSI_H: return "H"; - case kVK_ANSI_I: return "I"; - case kVK_ANSI_J: return "J"; - case kVK_ANSI_K: return "K"; - case kVK_ANSI_L: return "L"; - case kVK_ANSI_M: return "M"; - case kVK_ANSI_N: return "N"; - case kVK_ANSI_O: return "O"; - case kVK_ANSI_P: return "P"; - case kVK_ANSI_Q: return "Q"; - case kVK_ANSI_R: return "R"; - case kVK_ANSI_S: return "S"; - case kVK_ANSI_T: return "T"; - case kVK_ANSI_U: return "U"; - case kVK_ANSI_V: return "V"; - case kVK_ANSI_W: return "W"; - case kVK_ANSI_X: return "X"; - case kVK_ANSI_Y: return "Y"; - case kVK_ANSI_Z: return "Z"; - case kVK_ANSI_0: return "0"; - case kVK_ANSI_1: return "1"; - case kVK_ANSI_2: return "2"; - case kVK_ANSI_3: return "3"; - case kVK_ANSI_4: return "4"; - case kVK_ANSI_5: return "5"; - case kVK_ANSI_6: return "6"; - case kVK_ANSI_7: return "7"; - case kVK_ANSI_8: return "8"; - case kVK_ANSI_9: return "9"; - case kVK_ANSI_Grave: return "`"; - case kVK_ANSI_Minus: return "-"; - case kVK_ANSI_Equal: return "="; - case kVK_ANSI_LeftBracket: return "["; - case kVK_ANSI_RightBracket: return "]"; - case kVK_ANSI_Backslash: return "\\"; - case kVK_ANSI_Semicolon: return ";"; - case kVK_ANSI_Quote: return "'"; - case kVK_ANSI_Comma: return ","; - case kVK_ANSI_Period: return "."; - case kVK_ANSI_Slash: return "/"; - case kVK_Escape: return "⎋"; - case kVK_Tab: return "⇥"; - case kVK_Delete: return "⌫"; - case kVK_ForwardDelete: return "⌦"; - case kVK_Return: return "↩"; - case kVK_Space: return "â£"; - case kVK_ANSI_KeypadDecimal: return "Keypad ."; - case kVK_ANSI_KeypadMultiply: return "Keypad *"; - case kVK_ANSI_KeypadPlus: return "Keypad +"; - case kVK_ANSI_KeypadClear: return "⌧"; - case kVK_ANSI_KeypadDivide: return "Keypad /"; - case kVK_ANSI_KeypadEnter: return "⌤"; - case kVK_ANSI_KeypadMinus: return "Keypad -"; - case kVK_ANSI_KeypadEquals: return "Keypad ="; - case kVK_ANSI_Keypad0: return "Keypad 0"; - case kVK_ANSI_Keypad1: return "Keypad 1"; - case kVK_ANSI_Keypad2: return "Keypad 2"; - case kVK_ANSI_Keypad3: return "Keypad 3"; - case kVK_ANSI_Keypad4: return "Keypad 4"; - case kVK_ANSI_Keypad5: return "Keypad 5"; - case kVK_ANSI_Keypad6: return "Keypad 6"; - case kVK_ANSI_Keypad7: return "Keypad 7"; - case kVK_ANSI_Keypad8: return "Keypad 8"; - case kVK_ANSI_Keypad9: return "Keypad 9"; - case kVK_Command: return "Left ⌘"; - case kVK_Shift: return "Left ⇧"; - case kVK_CapsLock: return "⇪"; - case kVK_Option: return "Left ⌥"; - case kVK_Control: return "Left ⌃"; - case kVK_RightCommand: return "Right ⌘"; - case kVK_RightShift: return "Right ⇧"; - case kVK_RightOption: return "Right ⌥"; - case kVK_RightControl: return "Right ⌃"; - case kVK_Function: return "fn"; - case kVK_VolumeUp: return "Volume Up"; - case kVK_VolumeDown: return "Volume Down"; - case kVK_Mute: return "Mute"; - case kVK_F1: return "F1"; - case kVK_F2: return "F2"; - case kVK_F3: return "F3"; - case kVK_F4: return "F4"; - case kVK_F5: return "F5"; - case kVK_F6: return "F6"; - case kVK_F7: return "F7"; - case kVK_F8: return "F8"; - case kVK_F9: return "F9"; - case kVK_F10: return "F10"; - case kVK_F11: return "F11"; - case kVK_F12: return "F12"; - case kVK_F13: return "F13"; - case kVK_F14: return "F14"; - case kVK_F15: return "F15"; - case kVK_F16: return "F16"; - case kVK_F17: return "F17"; - case kVK_F18: return "F18"; - case kVK_F19: return "F19"; - case kVK_F20: return "F20"; - case kVK_Help: return "Help"; - case kVK_Home: return "↖"; - case kVK_PageUp: return "⇞"; - case kVK_End: return "↘"; - case kVK_PageDown: return "⇟"; - case kVK_LeftArrow: return "â†"; - case kVK_RightArrow: return "→"; - case kVK_DownArrow: return "↓"; - case kVK_UpArrow: return "↑"; - case kVK_ISO_Section: return "Section"; - case kVK_JIS_Yen: return "Â¥"; - case kVK_JIS_Underscore: return "_"; - case kVK_JIS_KeypadComma: return "Keypad ,"; - case kVK_JIS_Eisu: return "英数"; - case kVK_JIS_Kana: return "ã‹ãª"; - default: return "Key " + std::to_string(keysym); - } - // clang-format on -} -#else -static std::string KeyName(int pad, int key, int keysym) -{ - // Mouse - if (keysym >> 16) - { - switch (keysym & 0xFFFF) - { - case 0: - return "Mouse ???"; - case 1: - return "Mouse Left"; - case 2: - return "Mouse Middle"; - case 3: - return "Mouse Right"; - default: // Use only number for extra button - return "Mouse " + std::to_string((keysym & 0xFFFF) + 1); - } - } - - return std::string(XKeysymToString(keysym)); -} -#endif - -// Construtor of Dialog -PADDialog::PADDialog() - : wxDialog(NULL, // Parent - wxID_ANY, // ID - _T("Gamepad Settings"), // Title - wxDefaultPosition, // Position - wxSize(DEFAULT_WIDTH, DEFAULT_HEIGHT), // Width + Lenght - // Style - wxSYSTEM_MENU | - wxCAPTION | - wxCLOSE_BOX | - wxCLIP_CHILDREN) -{ - - /* - * Define the size and the position of each button : - * padding[ButtonID][0] : Width - * padding[ButtonID][1] : Height - * padding[ButtonID][2] : x position - * padding[ButtonID][3] : y position - */ - int padding[BUTTONS_LENGHT][4]; - - // L1 - padding[PAD_L1][0] = 218; // Width - padding[PAD_L1][1] = 28; // Height - padding[PAD_L1][2] = 50; // X - padding[PAD_L1][3] = 175; // Y - - // L2 - padding[PAD_L2][0] = 218; // Width - padding[PAD_L2][1] = 28; // Height - padding[PAD_L2][2] = 50; // X - padding[PAD_L2][3] = 104; // Y - - // R1 - padding[PAD_R1][0] = 218; // Width - padding[PAD_R1][1] = 28; // Height - padding[PAD_R1][2] = 726; // X - padding[PAD_R1][3] = 175; // Y - - // R2 - padding[PAD_R2][0] = 218; // Width - padding[PAD_R2][1] = 28; // Height - padding[PAD_R2][2] = 726; // X - padding[PAD_R2][3] = 104; // Y - - // Triangle - padding[PAD_TRIANGLE][0] = 218; // Width - padding[PAD_TRIANGLE][1] = 28; // Height - padding[PAD_TRIANGLE][2] = 726; // X - padding[PAD_TRIANGLE][3] = 246; // Y - - // Circle - padding[PAD_CIRCLE][0] = 218; // Width - padding[PAD_CIRCLE][1] = 28; // Height - padding[PAD_CIRCLE][2] = 726; // X - padding[PAD_CIRCLE][3] = 319; // Y - - // Cross - padding[PAD_CROSS][0] = 218; // Width - padding[PAD_CROSS][1] = 28; // Height - padding[PAD_CROSS][2] = 726; // X - padding[PAD_CROSS][3] = 391; // Y - - // Square - padding[PAD_SQUARE][0] = 218; // Width - padding[PAD_SQUARE][1] = 28; // Height - padding[PAD_SQUARE][2] = 726; // X - padding[PAD_SQUARE][3] = 463; // Y - - // Directional pad up - padding[PAD_UP][0] = 100; // Width - padding[PAD_UP][1] = 25; // Height - padding[PAD_UP][2] = 108; // X - padding[PAD_UP][3] = 290; // Y - - // Directional pad down - padding[PAD_DOWN][0] = 100; // Width - padding[PAD_DOWN][1] = 25; // Height - padding[PAD_DOWN][2] = 108; // X - padding[PAD_DOWN][3] = 340; // Y - - // Directional pad right - padding[PAD_RIGHT][0] = 109; // Width - padding[PAD_RIGHT][1] = 25; // Height - padding[PAD_RIGHT][2] = 159; // X - padding[PAD_RIGHT][3] = 315; // Y - - // Directional pad left - padding[PAD_LEFT][0] = 109; // Width - padding[PAD_LEFT][1] = 25; // Height - padding[PAD_LEFT][2] = 50; // X - padding[PAD_LEFT][3] = 315; // Y - - // Left Joystick up - padding[PAD_L_UP][0] = 100; // Width - padding[PAD_L_UP][1] = 25; // Height - padding[PAD_L_UP][2] = 325; // X - padding[PAD_L_UP][3] = 527; // Y - - // Left Joystick down - padding[PAD_L_DOWN][0] = 100; // Width - padding[PAD_L_DOWN][1] = 25; // Height - padding[PAD_L_DOWN][2] = 325; // X - padding[PAD_L_DOWN][3] = 577; // Y - - // Left Joystick right - padding[PAD_L_RIGHT][0] = 109; // Width - padding[PAD_L_RIGHT][1] = 25; // Height - padding[PAD_L_RIGHT][2] = 377; // X - padding[PAD_L_RIGHT][3] = 552; // Y - - // Left Joystick left - padding[PAD_L_LEFT][0] = 109; // Width - padding[PAD_L_LEFT][1] = 25; // Height - padding[PAD_L_LEFT][2] = 268; // X - padding[PAD_L_LEFT][3] = 552; // Y - - // L3 - padding[PAD_L3][0] = 218; // Width - padding[PAD_L3][1] = 28; // Height - padding[PAD_L3][2] = 268; // X - padding[PAD_L3][3] = 641; // Y - - // Right Joystick up - padding[PAD_R_UP][0] = 100; // Width - padding[PAD_R_UP][1] = 25; // Height - padding[PAD_R_UP][2] = 555; // X - padding[PAD_R_UP][3] = 527; // Y - - // Right Joystick down - padding[PAD_R_DOWN][0] = 100; // Width - padding[PAD_R_DOWN][1] = 25; // Height - padding[PAD_R_DOWN][2] = 555; // X - padding[PAD_R_DOWN][3] = 577; // Y - - // Right Joystick right - padding[PAD_R_RIGHT][0] = 109; // Width - padding[PAD_R_RIGHT][1] = 25; // Height - padding[PAD_R_RIGHT][2] = 607; // X - padding[PAD_R_RIGHT][3] = 552; // Y - - // Right Joystick left - padding[PAD_R_LEFT][0] = 109; // Width - padding[PAD_R_LEFT][1] = 25; // Height - padding[PAD_R_LEFT][2] = 498; // X - padding[PAD_R_LEFT][3] = 552; // Y - - // R3 - padding[PAD_R3][0] = 218; // Width - padding[PAD_R3][1] = 28; // Height - padding[PAD_R3][2] = 498; // X - padding[PAD_R3][3] = 641; // Y - - // Start - padding[PAD_START][0] = 218; // Width - padding[PAD_START][1] = 28; // Height - padding[PAD_START][2] = 503; // X - padding[PAD_START][3] = 34; // Y - - // Select - padding[PAD_SELECT][0] = 218; // Width - padding[PAD_SELECT][1] = 28; // Height - padding[PAD_SELECT][2] = 273; // X - padding[PAD_SELECT][3] = 34; // Y - - // Analog - padding[Analog][0] = 218; // Width - padding[Analog][1] = 28; // Height - padding[Analog][2] = 50; // X - padding[Analog][3] = 452; // Y - - // Left Joystick Configuration - padding[JoyL_config][0] = 180; // Width - padding[JoyL_config][1] = 28; // Height - padding[JoyL_config][2] = 50; // X - padding[JoyL_config][3] = 550; // Y - - // Right Joystick Configuration - padding[JoyR_config][0] = 180; // Width - padding[JoyR_config][1] = 28; // Height - padding[JoyR_config][2] = 764; // X - padding[JoyR_config][3] = 550; // Y - - // Gamepad Configuration - padding[Gamepad_config][0] = 180; // Width - padding[Gamepad_config][1] = 28; // Height - padding[Gamepad_config][2] = 50; // X - padding[Gamepad_config][3] = 585; // Y - - // Set All Buttons - padding[Set_all][0] = 180; // Width - padding[Set_all][1] = 28; // Height - padding[Set_all][2] = 764; // X - padding[Set_all][3] = 585; // Y - - // Apply modifications without exit - padding[Apply][0] = 70; // Width - padding[Apply][1] = 28; // Height - padding[Apply][2] = 833; // X - padding[Apply][3] = 642; // Y - - // Ok button - padding[Ok][0] = 70; // Width - padding[Ok][1] = 28; // Height - padding[Ok][2] = 913; // X - padding[Ok][3] = 642; // Y - - // Cancel button - padding[Cancel][0] = 70; // Width - padding[Cancel][1] = 28; // Height - padding[Cancel][2] = 753; // X - padding[Cancel][3] = 642; // Y - - // create a new Notebook - m_tab_gamepad = new wxNotebook(this, wxID_ANY); - for (u32 i = 0; i < GAMEPAD_NUMBER; ++i) - { - // Tabs panels - m_pan_tabs[i] = new opPanel( - m_tab_gamepad, - wxID_ANY, - wxDefaultPosition, - wxSize(DEFAULT_WIDTH, DEFAULT_HEIGHT)); - // Add new page - // Define label - std::stringstream sstm; - std::string label = "Gamepad "; - sstm << label << i; - // New page creation - m_tab_gamepad->AddPage( - m_pan_tabs[i], // Parent - wxString(sstm.str().c_str(), wxConvUTF8) // Title - ); - - for (int j = 0; j < BUTTONS_LENGHT; ++j) - { - // Gamepad buttons - m_bt_gamepad[i][j] = new wxButton( - m_pan_tabs[i], // Parent - wxID_HIGHEST + j + 1, // ID - _T("Undefined"), // Label - wxPoint(padding[j][2], padding[j][3]), // Position - wxSize(padding[j][0], padding[j][1]) // Size - ); - } - // Redefine others gui buttons label - m_bt_gamepad[i][JoyL_config]->SetLabel(_T("&Left Joystick Config")); - m_bt_gamepad[i][JoyR_config]->SetLabel(_T("&Right Joystick Config")); - m_bt_gamepad[i][Gamepad_config]->SetLabel(_T("&Gamepad Configuration")); - m_bt_gamepad[i][Set_all]->SetLabel(_T("&Set All Buttons")); - m_bt_gamepad[i][Cancel]->SetLabel(_T("&Cancel")); - m_bt_gamepad[i][Apply]->SetLabel(_T("&Apply")); - m_bt_gamepad[i][Ok]->SetLabel(_T("&Ok")); - - // Disable analog button (not yet supported) - m_bt_gamepad[i][Analog]->Disable(); - } - - Bind(wxEVT_BUTTON, &PADDialog::OnButtonClicked, this); - - for (u32 i = 0; i < GAMEPAD_NUMBER; ++i) - { - for (int j = 0; j < NB_IMG; ++j) - { - m_pressed[i][j] = false; - } - } -} - -void PADDialog::InitDialog() -{ - EnumerateDevices(); // activate gamepads - PADLoadConfig(); // Load configuration from the ini file - repopulate(); // Set label and fit simulated key array -} - -/****************************************/ -/*********** Events functions ***********/ -/****************************************/ - -void PADDialog::OnButtonClicked(wxCommandEvent& event) -{ - // Display a message each time the button is clicked - wxButton* bt_tmp = (wxButton*)event.GetEventObject(); // get the button object - int bt_id = bt_tmp->GetId() - wxID_HIGHEST - 1; // get the real ID - int gamepad_id = m_tab_gamepad->GetSelection(); // get the tab ID (equivalent to the gamepad id) - if (bt_id >= 0 && bt_id <= PAD_R_LEFT) - { // if the button ID is a gamepad button - bt_tmp->Disable(); // switch the button state to "Disable" - config_key(gamepad_id, bt_id); - bt_tmp->Enable(); // switch the button state to "Enable" - } - else if (bt_id == Gamepad_config) - { // If the button ID is equals to the Gamepad_config button ID - GamepadConfiguration gamepad_config(gamepad_id, this); - - gamepad_config.InitGamepadConfiguration(); - gamepad_config.ShowModal(); - } - else if (bt_id == JoyL_config) - { // If the button ID is equals to the JoyL_config button ID - JoystickConfiguration joystick_config(gamepad_id, true, this); - - joystick_config.InitJoystickConfiguration(); - joystick_config.ShowModal(); - } - else if (bt_id == JoyR_config) - { // If the button ID is equals to the JoyR_config button ID - JoystickConfiguration joystick_config(gamepad_id, false, this); - - joystick_config.InitJoystickConfiguration(); - joystick_config.ShowModal(); - } - else if (bt_id == Set_all) - { // If the button ID is equals to the Set_all button ID - for (u32 i = 0; i < MAX_KEYS; ++i) - { - bt_tmp = m_bt_gamepad[gamepad_id][i]; - switch (i) - { - case PAD_L_UP: // Left joystick (Up) ↑ - m_pan_tabs[gamepad_id]->ShowImg(img_l_arrow_up); - break; - case PAD_L_RIGHT: // Left joystick (Right) → - m_pan_tabs[gamepad_id]->ShowImg(img_l_arrow_right); - break; - case PAD_L_DOWN: // Left joystick (Down) ↓ - m_pan_tabs[gamepad_id]->ShowImg(img_l_arrow_bottom); - break; - case PAD_L_LEFT: // Left joystick (Left) ↠- m_pan_tabs[gamepad_id]->ShowImg(img_l_arrow_left); - break; - case PAD_R_UP: // Right joystick (Up) ↑ - m_pan_tabs[gamepad_id]->ShowImg(img_r_arrow_up); - break; - case PAD_R_RIGHT: // Right joystick (Right) → - m_pan_tabs[gamepad_id]->ShowImg(img_r_arrow_right); - break; - case PAD_R_DOWN: // Right joystick (Down) ↓ - m_pan_tabs[gamepad_id]->ShowImg(img_r_arrow_bottom); - break; - case PAD_R_LEFT: // Right joystick (Left) ↠- m_pan_tabs[gamepad_id]->ShowImg(img_r_arrow_left); - break; - default: - m_pan_tabs[gamepad_id]->ShowImg(i); - break; - } - m_pan_tabs[gamepad_id]->Refresh(); - m_pan_tabs[gamepad_id]->Update(); - bool key_captured = config_key(gamepad_id, i); - switch (i) - { - case PAD_L_UP: // Left joystick (Up) ↑ - m_pan_tabs[gamepad_id]->HideImg(img_l_arrow_up); - break; - case PAD_L_RIGHT: // Left joystick (Right) → - m_pan_tabs[gamepad_id]->HideImg(img_l_arrow_right); - break; - case PAD_L_DOWN: // Left joystick (Down) ↓ - m_pan_tabs[gamepad_id]->HideImg(img_l_arrow_bottom); - break; - case PAD_L_LEFT: // Left joystick (Left) ↠- m_pan_tabs[gamepad_id]->HideImg(img_l_arrow_left); - break; - case PAD_R_UP: // Right joystick (Up) ↑ - m_pan_tabs[gamepad_id]->HideImg(img_r_arrow_up); - break; - case PAD_R_RIGHT: // Right joystick (Right) → - m_pan_tabs[gamepad_id]->HideImg(img_r_arrow_right); - break; - case PAD_R_DOWN: // Right joystick (Down) ↓ - m_pan_tabs[gamepad_id]->HideImg(img_r_arrow_bottom); - break; - case PAD_R_LEFT: // Right joystick (Left) ↠- m_pan_tabs[gamepad_id]->HideImg(img_r_arrow_left); - break; - default: - m_pan_tabs[gamepad_id]->HideImg(i); - break; - } - m_pan_tabs[gamepad_id]->Refresh(); - m_pan_tabs[gamepad_id]->Update(); - if (!key_captured) - { // if ESC is hit, abort Set_all and return user control - break; - } - usleep(500000); // give enough time to the user to release the button - } - } - else if (bt_id == Ok) - { // If the button ID is equals to the Ok button ID - PADSaveConfig(); // Save the configuration - Close(); // Close the window - } - else if (bt_id == Apply) - { // If the button ID is equals to the Apply button ID - PADSaveConfig(); // Save the configuration - } - else if (bt_id == Cancel) - { // If the button ID is equals to the cancel button ID - Close(); // Close the window - } -} - -/****************************************/ -/*********** Methods functions **********/ -/****************************************/ - -bool PADDialog::config_key(int pad, int key) -{ - bool captured = false; - u32 key_pressed = 0; - - while (!captured) - { - if (PollForNewKeyboardKeys(key_pressed)) - { - // special case for keyboard/mouse to handle multiple keys - // Note: key_pressed == UINT32_MAX when ESC is hit to abort the capture - if (key_pressed != UINT32_MAX) - { - clear_key(pad, key); - set_keyboard_key(pad, key_pressed, key); - m_simulatedKeys[pad][key] = key_pressed; - } - else - { - return captured; - } - captured = true; - } - } - m_bt_gamepad[pad][key]->SetLabel( - KeyName(pad, key, m_simulatedKeys[pad][key]).c_str()); - - return captured; -} - -void PADDialog::clear_key(int pad, int key) -{ - // Erase the keyboard binded key - u32 keysim = m_simulatedKeys[pad][key]; - m_simulatedKeys[pad][key] = 0; - - // erase gamepad entry (keysim map) - g_conf.keysym_map[pad].erase(keysim); -} - - -// Set button values -void PADDialog::repopulate() -{ - for (u32 gamepad_id = 0; gamepad_id < GAMEPAD_NUMBER; ++gamepad_id) - { - // keyboard/mouse key - for (const auto& it : g_conf.keysym_map[gamepad_id]) - { - int keysym = it.first; - int key = it.second; - - m_bt_gamepad[gamepad_id][key]->SetLabel( - KeyName(gamepad_id, key, keysym).c_str()); - - m_simulatedKeys[gamepad_id][key] = keysym; - } - } -} - -// Main -void DisplayDialog() -{ - if (g_conf.ftw) - { - wxString info("The PAD GUI is provided to map the keyboard/mouse to the virtual PS2 pad.\n\n" - "Gamepads/Joysticks are plug and play. Re-mapping of Gamepads/Joysticks is currently not supported in the PAD GUI.\n\n" - "The active gamepad can be selected in the 'Gamepad Configuration' panel.\n\n"); - - wxMessageDialog ftw(nullptr, info); - ftw.ShowModal(); - - g_conf.ftw = 0; - PADSaveConfig(); - } - - PADDialog dialog; - - dialog.InitDialog(); - dialog.ShowModal(); -} diff --git a/pcsx2/PAD/Linux/wx_dialog/dialog.h b/pcsx2/PAD/Linux/wx_dialog/dialog.h deleted file mode 100644 index 642cecfc2f..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/dialog.h +++ /dev/null @@ -1,89 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "../InputManager.h" -#include "../keyboard.h" -#include "../Global.h" -#include "opPanel.h" - -#include "GamepadConfiguration.h" -#include "JoystickConfiguration.h" - -// Allow to found quickly button id -// e.g L2 → 0, triangle → 4, ... -// see Global.h for more details about gamepad button id - -enum gui_buttons -{ - Analog = PAD_R_LEFT + 1, // Analog button (not yet supported ?) - JoyL_config, // Left Joystick Configuration - JoyR_config, // Right Joystick Configuration - Gamepad_config, // Gamepad Configuration - Set_all, // Set all buttons - Apply, // Apply modifications without exit - Ok, // Apply modifications and exit - Cancel // Exit without apply modificatons -}; - -#define BUTTONS_LENGHT 32 // numbers of buttons on the gamepad -#define UPDATE_TIME 5 -#define DEFAULT_WIDTH 1000 -#define DEFAULT_HEIGHT 760 - -class PADDialog : public wxDialog -{ - // Panels - opPanel* m_pan_tabs[GAMEPAD_NUMBER]; // Gamepad Tabs box - // Notebooks - wxNotebook* m_tab_gamepad; // Joysticks Tabs - // Buttons - wxButton* m_bt_gamepad[GAMEPAD_NUMBER][BUTTONS_LENGHT]; // Joystick button use to modify the button mapping - // Contain all simulated key - u32 m_simulatedKeys[GAMEPAD_NUMBER][MAX_KEYS]; - // Timer - wxTimer m_time_update_gui; - // Check if the gui must display feddback image - bool m_pressed[GAMEPAD_NUMBER][NB_IMG]; - - // methods - bool config_key(int, int); - void clear_key(int, int); - void repopulate(); - - // Events - void OnButtonClicked(wxCommandEvent&); - void JoystickEvent(wxTimerEvent&); - -public: - PADDialog(); - void InitDialog(); - void show(); -}; - -extern void DisplayDialog(); // Main function diff --git a/pcsx2/PAD/Linux/wx_dialog/opPanel.cpp b/pcsx2/PAD/Linux/wx_dialog/opPanel.cpp deleted file mode 100644 index c7c6d0ea5f..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/opPanel.cpp +++ /dev/null @@ -1,243 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "opPanel.h" -#include "ImgHeader/dualshock2.h" -#include "ImgHeader/cross.h" -#include "ImgHeader/circle.h" -#include "ImgHeader/square.h" -#include "ImgHeader/triangle.h" -#include "ImgHeader/dp_left.h" -#include "ImgHeader/dp_right.h" -#include "ImgHeader/dp_up.h" -#include "ImgHeader/dp_bottom.h" -#include "ImgHeader/l1.h" -#include "ImgHeader/r1.h" -#include "ImgHeader/l2.h" -#include "ImgHeader/l3.h" -#include "ImgHeader/r2.h" -#include "ImgHeader/r3.h" -#include "ImgHeader/start.h" -#include "ImgHeader/select.h" -#include "ImgHeader/analog.h" -#include "ImgHeader/joystick_cursor.h" -#include "ImgHeader/arrow_up.h" -#include "ImgHeader/arrow_right.h" -#include "ImgHeader/arrow_bottom.h" -#include "ImgHeader/arrow_left.h" - -opPanel::opPanel(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize) - : wxPanel(parent, id, pos, size) -{ - m_picture[img_background] = EmbeddedImage().Get(); - - m_picture[img_start] = EmbeddedImage().Get(); - m_picture[img_select] = EmbeddedImage().Get(); - m_picture[img_analog] = EmbeddedImage().Get(); - - m_picture[img_dp_left] = EmbeddedImage().Get(); - m_picture[img_dp_right] = EmbeddedImage().Get(); - m_picture[img_dp_up] = EmbeddedImage().Get(); - m_picture[img_dp_bottom] = EmbeddedImage().Get(); - - m_picture[img_square] = EmbeddedImage().Get(); - m_picture[img_circle] = EmbeddedImage().Get(); - m_picture[img_cross] = EmbeddedImage().Get(); - m_picture[img_triangle] = EmbeddedImage().Get(); - - m_picture[img_l1] = EmbeddedImage().Get(); - m_picture[img_l3] = EmbeddedImage().Get(); - m_picture[img_l2] = EmbeddedImage().Get(); - - m_picture[img_r1] = EmbeddedImage().Get(); - m_picture[img_r3] = EmbeddedImage().Get(); - m_picture[img_r2] = EmbeddedImage().Get(); - - m_picture[img_left_cursor] = EmbeddedImage().Get(); - m_picture[img_right_cursor] = EmbeddedImage().Get(); - - m_picture[img_l_arrow_up] = EmbeddedImage().Get(); - m_picture[img_l_arrow_right] = EmbeddedImage().Get(); - m_picture[img_l_arrow_bottom] = EmbeddedImage().Get(); - m_picture[img_l_arrow_left] = EmbeddedImage().Get(); - - m_picture[img_r_arrow_up] = EmbeddedImage().Get(); - m_picture[img_r_arrow_right] = EmbeddedImage().Get(); - m_picture[img_r_arrow_bottom] = EmbeddedImage().Get(); - m_picture[img_r_arrow_left] = EmbeddedImage().Get(); - - for (int i = 0; i < NB_IMG; ++i) - { - m_show_image[i] = false; - HideImg(i); - } - ShowImg(img_background); - m_show_image[img_background] = true; - - m_left_cursor_x = 0; - m_left_cursor_y = 0; - m_right_cursor_x = 0; - m_right_cursor_y = 0; -} - -void opPanel::HideImg(int id) -{ - if (id < NB_IMG) - { - m_show_image[id] = false; - Refresh(); - } -} - -void opPanel::ShowImg(int id) -{ - if (id < NB_IMG) - { - m_show_image[id] = true; - Refresh(); - } -} - -void opPanel::MoveJoystick(int axe, int value) -{ - if (axe == 0) - { - m_left_cursor_x = value * 30 / 40000; - } - else if (axe == 1) - { - m_left_cursor_y = value * 30 / 40000; - } - else if (axe == 2) - { - m_right_cursor_x = value * 30 / 40000; - } - else - { - m_right_cursor_y = value * 30 / 40000; - } -} - -wxBEGIN_EVENT_TABLE(opPanel, wxPanel) - EVT_PAINT(opPanel::OnPaint) - wxEND_EVENT_TABLE() - - void opPanel::OnPaint(wxPaintEvent& event) -{ - wxPaintDC dc(this); - - wxMemoryDC temp_background, temp_start, temp_select, temp_analog, temp_dp_left, - temp_dp_right, temp_dp_up, temp_dp_bottom, temp_l1, temp_r1, temp_L3, temp_l2_2, - temp_R3, temp_r2_2, temp_square, temp_circle, temp_cross, temp_triangle, - temp_left_cursor, temp_right_cursor, temp_l_arrow_up, temp_l_arrow_right, - temp_l_arrow_bottom, temp_l_arrow_left, temp_r_arrow_up, temp_r_arrow_right, - temp_r_arrow_bottom, temp_r_arrow_left; - - temp_background.SelectObject(m_picture[img_background]); - temp_start.SelectObject(m_picture[img_start]); - temp_select.SelectObject(m_picture[img_select]); - temp_analog.SelectObject(m_picture[img_analog]); - temp_dp_left.SelectObject(m_picture[img_dp_left]); - - temp_dp_right.SelectObject(m_picture[img_dp_right]); - temp_dp_up.SelectObject(m_picture[img_dp_up]); - temp_dp_bottom.SelectObject(m_picture[img_dp_bottom]); - temp_l1.SelectObject(m_picture[img_l1]); - temp_r1.SelectObject(m_picture[img_r1]); - temp_L3.SelectObject(m_picture[img_l3]); - temp_l2_2.SelectObject(m_picture[img_l2]); - - temp_R3.SelectObject(m_picture[img_r3]); - temp_r2_2.SelectObject(m_picture[img_r2]); - temp_square.SelectObject(m_picture[img_square]); - temp_circle.SelectObject(m_picture[img_circle]); - temp_cross.SelectObject(m_picture[img_cross]); - temp_triangle.SelectObject(m_picture[img_triangle]); - - temp_left_cursor.SelectObject(m_picture[img_left_cursor]); - temp_right_cursor.SelectObject(m_picture[img_right_cursor]); - - temp_l_arrow_up.SelectObject(m_picture[img_l_arrow_up]); - temp_l_arrow_right.SelectObject(m_picture[img_l_arrow_right]); - temp_l_arrow_bottom.SelectObject(m_picture[img_l_arrow_bottom]); - temp_l_arrow_left.SelectObject(m_picture[img_l_arrow_left]); - - temp_r_arrow_up.SelectObject(m_picture[img_r_arrow_up]); - temp_r_arrow_right.SelectObject(m_picture[img_r_arrow_right]); - temp_r_arrow_bottom.SelectObject(m_picture[img_r_arrow_bottom]); - temp_r_arrow_left.SelectObject(m_picture[img_r_arrow_left]); - - if (m_show_image[img_background]) - dc.Blit(wxPoint(0, 0), temp_background.GetSize(), &temp_background, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_start]) - dc.Blit(wxPoint(526, 296), temp_start.GetSize(), &temp_start, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_select]) - dc.Blit(wxPoint(450, 297), temp_select.GetSize(), &temp_select, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_analog]) - dc.Blit(wxPoint(489, 358), temp_analog.GetSize(), &temp_analog, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_dp_left]) - dc.Blit(wxPoint(334, 292), temp_dp_left.GetSize(), &temp_dp_left, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_dp_right]) - dc.Blit(wxPoint(378, 292), temp_dp_right.GetSize(), &temp_dp_right, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_dp_up]) - dc.Blit(wxPoint(358, 269), temp_dp_up.GetSize(), &temp_dp_up, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_dp_bottom]) - dc.Blit(wxPoint(358, 312), temp_dp_bottom.GetSize(), &temp_dp_bottom, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_l1]) - dc.Blit(wxPoint(343, 186), temp_l1.GetSize(), &temp_l1, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_r1]) - dc.Blit(wxPoint(593, 186), temp_r1.GetSize(), &temp_r1, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_l3]) - dc.Blit(wxPoint(409, 344), temp_L3.GetSize(), &temp_L3, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_l2]) - dc.Blit(wxPoint(346, 158), temp_l2_2.GetSize(), &temp_l2_2, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_r3]) - dc.Blit(wxPoint(525, 344), temp_R3.GetSize(), &temp_R3, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_r2]) - dc.Blit(wxPoint(582, 158), temp_r2_2.GetSize(), &temp_r2_2, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_square]) - dc.Blit(wxPoint(573, 287), temp_square.GetSize(), &temp_square, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_circle]) - dc.Blit(wxPoint(647, 287), temp_circle.GetSize(), &temp_circle, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_cross]) - dc.Blit(wxPoint(610, 324), temp_cross.GetSize(), &temp_cross, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_triangle]) - dc.Blit(wxPoint(610, 250), temp_triangle.GetSize(), &temp_triangle, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_left_cursor]) - dc.Blit(wxPoint(439 + m_left_cursor_x, 374 + m_left_cursor_y), temp_left_cursor.GetSize(), &temp_left_cursor, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_right_cursor]) - dc.Blit(wxPoint(555 + m_right_cursor_x, 374 + m_right_cursor_y), temp_right_cursor.GetSize(), &temp_right_cursor, wxPoint(0, 0), wxCOPY, true); - - if (m_show_image[img_l_arrow_up]) - dc.Blit(wxPoint(433, 357), temp_l_arrow_up.GetSize(), &temp_l_arrow_up, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_l_arrow_right]) - dc.Blit(wxPoint(423, 368), temp_l_arrow_right.GetSize(), &temp_l_arrow_right, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_l_arrow_bottom]) - dc.Blit(wxPoint(433, 357), temp_l_arrow_bottom.GetSize(), &temp_l_arrow_bottom, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_l_arrow_left]) - dc.Blit(wxPoint(423, 368), temp_l_arrow_left.GetSize(), &temp_l_arrow_left, wxPoint(0, 0), wxCOPY, true); - - if (m_show_image[img_r_arrow_up]) - dc.Blit(wxPoint(548, 357), temp_r_arrow_up.GetSize(), &temp_r_arrow_up, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_r_arrow_right]) - dc.Blit(wxPoint(539, 368), temp_r_arrow_right.GetSize(), &temp_r_arrow_right, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_r_arrow_bottom]) - dc.Blit(wxPoint(548, 357), temp_r_arrow_bottom.GetSize(), &temp_r_arrow_bottom, wxPoint(0, 0), wxCOPY, true); - if (m_show_image[img_r_arrow_left]) - dc.Blit(wxPoint(539, 368), temp_r_arrow_left.GetSize(), &temp_r_arrow_left, wxPoint(0, 0), wxCOPY, true); -} diff --git a/pcsx2/PAD/Linux/wx_dialog/opPanel.h b/pcsx2/PAD/Linux/wx_dialog/opPanel.h deleted file mode 100644 index 3980976cc6..0000000000 --- a/pcsx2/PAD/Linux/wx_dialog/opPanel.h +++ /dev/null @@ -1,69 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - -#include "gui/EmbeddedImage.h" - -enum gui_img -{ - img_l2, - img_r2, - img_l1, - img_r1, - img_triangle, - img_circle, - img_cross, - img_square, - img_select, - img_l3, - img_r3, - img_start, - img_dp_up, - img_dp_right, - img_dp_bottom, - img_dp_left, - img_left_cursor, - img_right_cursor, - img_analog, - img_background, // background pic - img_l_arrow_up, - img_l_arrow_right, - img_l_arrow_bottom, - img_l_arrow_left, - img_r_arrow_up, - img_r_arrow_right, - img_r_arrow_bottom, - img_r_arrow_left -}; - -#define NB_IMG 28 - -class opPanel : public wxPanel -{ - wxBitmap m_picture[NB_IMG]; - bool m_show_image[NB_IMG]; - int m_left_cursor_x, m_left_cursor_y, m_right_cursor_x, m_right_cursor_y; - wxDECLARE_EVENT_TABLE(); - void OnPaint(wxPaintEvent& event); - -public: - opPanel(wxWindow*, wxWindowID, const wxPoint&, const wxSize&); - void HideImg(int); - void ShowImg(int); - void MoveJoystick(int, int); -}; diff --git a/pcsx2/PAD/Windows/Default.ini b/pcsx2/PAD/Windows/Default.ini deleted file mode 100644 index 5133ff4586..0000000000 --- a/pcsx2/PAD/Windows/Default.ini +++ /dev/null @@ -1,191 +0,0 @@ -[General Settings] -Last Config Path=inis -Last Config Name=PAD.pad -Force Cursor Hide=0 -Mouse Unfocus=1 -Background=1 -Multiple Bindings=0 -DirectInput Game Devices=1 -XInput=1 -DualShock 3=0 -Multitap 1=0 -Multitap 2=0 -Logging=0 -GH2=0 -Keyboard Mode=2 -Mouse Mode=0 -[Pad Settings] -Configure On Bind=0 -[Pad 0 0] -Mode=1 -[Pad 0 1] -Mode=1 -[Pad 0 2] -Mode=1 -[Pad 0 3] -Mode=1 -[Pad 1 0] -Mode=1 -[Pad 1 1] -Mode=1 -[Pad 1 2] -Mode=1 -[Pad 1 3] -Mode=1 -[Device 0] -Display Name=XInput Pad 0 -Instance ID=XInput Pad 0 -API=4 -Type=3 -Binding 0=0x00200000, 0, 20, 65536, 0, 0, 1, 1 -Binding 1=0x00200001, 0, 22, 65536, 0, 0, 1, 1 -Binding 2=0x00200002, 0, 23, 65536, 0, 0, 1, 1 -Binding 3=0x00200003, 0, 21, 65536, 0, 0, 1, 1 -Binding 4=0x00200004, 0, 19, 65536, 0, 0, 1, 1 -Binding 5=0x00200005, 0, 16, 65536, 0, 0, 1, 1 -Binding 6=0x00200006, 0, 17, 65536, 0, 0, 1, 1 -Binding 7=0x00200007, 0, 18, 65536, 0, 0, 1, 1 -Binding 8=0x00200008, 0, 26, 65536, 0, 0, 1, 1 -Binding 9=0x00200009, 0, 27, 65536, 0, 0, 1, 1 -Binding 10=0x0020000A, 0, 40, 65536, 0, 0, 1, 1 -Binding 11=0x0020000C, 0, 30, 65536, 0, 0, 1, 1 -Binding 12=0x0020000D, 0, 29, 65536, 0, 0, 1, 1 -Binding 13=0x0020000E, 0, 31, 65536, 0, 0, 1, 1 -Binding 14=0x0020000F, 0, 28, 65536, 0, 0, 1, 1 -Binding 15=0x00200010, 0, 24, 65536, 0, 0, 1, 1 -Binding 16=0x00200011, 0, 25, 65536, 0, 0, 1, 1 -Binding 17=0x01020013, 0, 33, 87183, 0, 0, 13172, 1 -Binding 18=0x02020013, 0, 35, 87183, 0, 0, 13172, 1 -Binding 19=0x01020014, 0, 32, 87183, 0, 0, 13172, 1 -Binding 20=0x02020014, 0, 34, 87183, 0, 0, 13172, 1 -Binding 21=0x01020015, 0, 37, 87183, 0, 0, 13172, 1 -Binding 22=0x02020015, 0, 39, 87183, 0, 0, 13172, 1 -Binding 23=0x01020016, 0, 36, 87183, 0, 0, 13172, 1 -Binding 24=0x02020016, 0, 38, 87183, 0, 0, 13172, 1 -Binding 25=0x00200000, 0, 20, 65536, 0, 0, 1, 2 -Binding 26=0x00200001, 0, 22, 65536, 0, 0, 1, 2 -Binding 27=0x00200004, 0, 19, 65536, 0, 0, 1, 2 -Binding 28=0x00200005, 0, 16, 65536, 0, 0, 1, 2 -Binding 29=0x00200008, 0, 25, 65536, 0, 0, 1, 2 -Binding 30=0x00200009, 0, 28, 65536, 0, 0, 1, 2 -Binding 31=0x0020000F, 0, 30, 65536, 0, 0, 1, 2 -Binding 32=0x00200010, 0, 29, 65536, 0, 0, 1, 2 -Binding 33=0x00200011, 0, 31, 65536, 0, 0, 1, 2 -Binding 34=0x01020014, 0, 32, 65536, 0, 0, 13172, 2 -Binding 35=0x02020014, 0, 34, 65536, 0, 0, 13172, 2 -Binding 36=0x00200002, 0, 28, 65536, 0, 0, 1, 3 -Binding 37=0x00200003, 0, 27, 65536, 0, 0, 1, 3 -Binding 38=0x00200004, 0, 19, 65536, 0, 0, 1, 3 -Binding 39=0x00200005, 0, 16, 65536, 0, 0, 1, 3 -Binding 40=0x00200008, 0, 30, 65536, 0, 0, 1, 3 -Binding 41=0x00200009, 0, 31, 65536, 0, 0, 1, 3 -Binding 42=0x0020000C, 0, 25, 65536, 0, 0, 1, 3 -Binding 43=0x0020000D, 0, 24, 65536, 0, 0, 1, 3 -Binding 44=0x0020000E, 0, 26, 65536, 0, 0, 1, 3 -Binding 45=0x00200010, 0, 29, 65536, 0, 0, 1, 3 -Binding 46=0x00200011, 0, 20, 65536, 0, 0, 1, 3 -Binding 47=0x00200008, 0, 29, 65536, 0, 0, 1, 4 -Binding 48=0x00200009, 0, 30, 65536, 0, 0, 1, 4 -Binding 49=0x01020013, 0, 33, 3000, 0, 0, 13172, 4 -Binding 50=0x02020013, 0, 35, 3000, 0, 0, 13172, 4 -Binding 51=0x01020014, 0, 32, 3000, 0, 0, 13172, 4 -Binding 52=0x02020014, 0, 34, 3000, 0, 0, 13172, 4 -Binding 53=0x00200000, 0, 20, 65536, 0, 0, 1, 5 -Binding 54=0x00200001, 0, 22, 65536, 0, 0, 1, 5 -Binding 55=0x00200002, 0, 23, 65536, 0, 0, 1, 5 -Binding 56=0x00200003, 0, 21, 65536, 0, 0, 1, 5 -Binding 57=0x00200004, 0, 19, 65536, 0, 0, 1, 5 -Binding 58=0x00200008, 0, 26, 65536, 0, 0, 1, 5 -Binding 59=0x00200009, 0, 27, 65536, 0, 0, 1, 5 -Binding 60=0x0020000C, 0, 30, 65536, 0, 0, 1, 5 -Binding 61=0x0020000D, 0, 29, 65536, 0, 0, 1, 5 -Binding 62=0x0020000E, 0, 31, 65536, 0, 0, 1, 5 -Binding 63=0x0020000F, 0, 28, 65536, 0, 0, 1, 5 -Binding 64=0x01020013, 0, 33, 87183, 0, 0, 13172, 5 -Binding 65=0x02020013, 0, 35, 87183, 0, 0, 13172, 5 -FF Binding 0=Constant 0, 0, 0, 1, 0, 65536, 1, 0 -FF Binding 1=Constant 0, 1, 0, 1, 0, 0, 1, 65536 -[Device 1] -Display Name=XInput Pad 1 -Instance ID=XInput Pad 1 -API=4 -Type=3 -Binding 0=0x00200000, 1, 20, 65536, 0, 0, 1, 1 -Binding 1=0x00200001, 1, 22, 65536, 0, 0, 1, 1 -Binding 2=0x00200002, 1, 23, 65536, 0, 0, 1, 1 -Binding 3=0x00200003, 1, 21, 65536, 0, 0, 1, 1 -Binding 4=0x00200004, 1, 19, 65536, 0, 0, 1, 1 -Binding 5=0x00200005, 1, 16, 65536, 0, 0, 1, 1 -Binding 6=0x00200006, 1, 17, 65536, 0, 0, 1, 1 -Binding 7=0x00200007, 1, 18, 65536, 0, 0, 1, 1 -Binding 8=0x00200008, 1, 26, 65536, 0, 0, 1, 1 -Binding 9=0x00200009, 1, 27, 65536, 0, 0, 1, 1 -Binding 10=0x0020000A, 1, 40, 65536, 0, 0, 1, 1 -Binding 11=0x0020000C, 1, 30, 65536, 0, 0, 1, 1 -Binding 12=0x0020000D, 1, 29, 65536, 0, 0, 1, 1 -Binding 13=0x0020000E, 1, 31, 65536, 0, 0, 1, 1 -Binding 14=0x0020000F, 1, 28, 65536, 0, 0, 1, 1 -Binding 15=0x00200010, 1, 24, 65536, 0, 0, 1, 1 -Binding 16=0x00200011, 1, 25, 65536, 0, 0, 1, 1 -Binding 17=0x01020013, 1, 33, 87183, 0, 0, 13172, 1 -Binding 18=0x02020013, 1, 35, 87183, 0, 0, 13172, 1 -Binding 19=0x01020014, 1, 32, 87183, 0, 0, 13172, 1 -Binding 20=0x02020014, 1, 34, 87183, 0, 0, 13172, 1 -Binding 21=0x01020015, 1, 37, 87183, 0, 0, 13172, 1 -Binding 22=0x02020015, 1, 39, 87183, 0, 0, 13172, 1 -Binding 23=0x01020016, 1, 36, 87183, 0, 0, 13172, 1 -Binding 24=0x02020016, 1, 38, 87183, 0, 0, 13172, 1 -Binding 25=0x00200000, 1, 20, 65536, 0, 0, 1, 2 -Binding 26=0x00200001, 1, 22, 65536, 0, 0, 1, 2 -Binding 27=0x00200004, 1, 19, 65536, 0, 0, 1, 2 -Binding 28=0x00200005, 1, 16, 65536, 0, 0, 1, 2 -Binding 29=0x00200008, 1, 25, 65536, 0, 0, 1, 2 -Binding 30=0x00200009, 1, 28, 65536, 0, 0, 1, 2 -Binding 31=0x0020000F, 1, 30, 65536, 0, 0, 1, 2 -Binding 32=0x00200010, 1, 29, 65536, 0, 0, 1, 2 -Binding 33=0x00200011, 1, 31, 65536, 0, 0, 1, 2 -Binding 34=0x01020014, 1, 32, 65536, 0, 0, 13172, 2 -Binding 35=0x02020014, 1, 34, 65536, 0, 0, 13172, 2 -Binding 36=0x00200002, 1, 28, 65536, 0, 0, 1, 3 -Binding 37=0x00200003, 1, 27, 65536, 0, 0, 1, 3 -Binding 38=0x00200004, 1, 19, 65536, 0, 0, 1, 3 -Binding 39=0x00200005, 1, 16, 65536, 0, 0, 1, 3 -Binding 40=0x00200008, 1, 30, 65536, 0, 0, 1, 3 -Binding 41=0x00200009, 1, 31, 65536, 0, 0, 1, 3 -Binding 42=0x0020000C, 1, 25, 65536, 0, 0, 1, 3 -Binding 43=0x0020000D, 1, 24, 65536, 0, 0, 1, 3 -Binding 44=0x0020000E, 1, 26, 65536, 0, 0, 1, 3 -Binding 45=0x00200010, 1, 29, 65536, 0, 0, 1, 3 -Binding 46=0x00200011, 1, 20, 65536, 0, 0, 1, 3 -Binding 47=0x00200008, 1, 29, 65536, 0, 0, 1, 4 -Binding 48=0x00200009, 1, 30, 65536, 0, 0, 1, 4 -Binding 49=0x01020013, 1, 33, 3000, 0, 0, 13172, 4 -Binding 50=0x02020013, 1, 35, 3000, 0, 0, 13172, 4 -Binding 51=0x01020014, 1, 32, 3000, 0, 0, 13172, 4 -Binding 52=0x02020014, 1, 34, 3000, 0, 0, 13172, 4 -Binding 53=0x00200000, 1, 20, 65536, 0, 0, 1, 5 -Binding 54=0x00200001, 1, 22, 65536, 0, 0, 1, 5 -Binding 55=0x00200002, 1, 23, 65536, 0, 0, 1, 5 -Binding 56=0x00200003, 1, 21, 65536, 0, 0, 1, 5 -Binding 57=0x00200004, 1, 19, 65536, 0, 0, 1, 5 -Binding 58=0x00200008, 1, 26, 65536, 0, 0, 1, 5 -Binding 59=0x00200009, 1, 27, 65536, 0, 0, 1, 5 -Binding 60=0x0020000C, 1, 30, 65536, 0, 0, 1, 5 -Binding 61=0x0020000D, 1, 29, 65536, 0, 0, 1, 5 -Binding 62=0x0020000E, 1, 31, 65536, 0, 0, 1, 5 -Binding 63=0x0020000F, 1, 28, 65536, 0, 0, 1, 5 -Binding 64=0x01020013, 1, 33, 87183, 0, 0, 13172, 5 -Binding 65=0x02020013, 1, 35, 87183, 0, 0, 13172, 5 -FF Binding 0=Constant 1, 0, 0, 1, 0, 65536, 1, 0 -FF Binding 1=Constant 1, 1, 0, 1, 0, 0, 1, 65536 -[Device 12] -Display Name=XInput Pad 2 -Instance ID=XInput Pad 2 -API=4 -Type=3 -[Device 13] -Display Name=XInput Pad 3 -Instance ID=XInput Pad 3 -API=4 -Type=3 - diff --git a/pcsx2/PAD/Windows/DeviceEnumerator.cpp b/pcsx2/PAD/Windows/DeviceEnumerator.cpp deleted file mode 100644 index da83e65815..0000000000 --- a/pcsx2/PAD/Windows/DeviceEnumerator.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "InputManager.h" - -#include "DeviceEnumerator.h" -#ifdef _WIN32 -#include "WindowsMessaging.h" -#include "DirectInput.h" -#include "PADRawInput.h" -#include "XInputEnum.h" -#include "HidDevice.h" -#include "DualShock3.h" -#endif - -#ifdef __linux__ -#include "Linux/KeyboardMouse.h" -#include "Linux/JoyEvdev.h" -#endif - -void EnumDevices(int hideDXXinput) -{ - // Needed for enumeration of some device types. - dm->ReleaseInput(); - InputDeviceManager* oldDm = dm; - dm = new InputDeviceManager(); - -#ifdef _MSC_VER - EnumWindowsMessagingDevices(); - EnumRawInputDevices(); - EnumDualShock3s(); - EnumXInputDevices(); - EnumDirectInputDevices(hideDXXinput); -#else - EnumLnx(); - EnumJoystickEvdev(); -#endif - - dm->CopyBindings(oldDm->numDevices, oldDm->devices); - - delete oldDm; -} diff --git a/pcsx2/PAD/Windows/DeviceEnumerator.h b/pcsx2/PAD/Windows/DeviceEnumerator.h deleted file mode 100644 index d7f663e9ee..0000000000 --- a/pcsx2/PAD/Windows/DeviceEnumerator.h +++ /dev/null @@ -1,16 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -void EnumDevices(int hideDXXinput); diff --git a/pcsx2/PAD/Windows/Diagnostics.cpp b/pcsx2/PAD/Windows/Diagnostics.cpp deleted file mode 100644 index ae0fa2eaaa..0000000000 --- a/pcsx2/PAD/Windows/Diagnostics.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "common/RedtapeWindows.h" - -#include "Global.h" -#include "DeviceEnumerator.h" -#include "KeyboardQueue.h" - -#include "resource_pad.h" -#include "InputManager.h" -#include "WndProcEater.h" - -Device* dev; - -INT_PTR CALLBACK DiagDialog(HWND hWnd, unsigned int uMsg, WPARAM wParam, LPARAM lParam) -{ - HWND hWndList = GetDlgItem(hWnd, IDC_DIAG_LIST); - if (dev) - { - static int fullRefresh; - switch (uMsg) - { - case WM_INITDIALOG: - { - fullRefresh = 1; - SetWindowText(hWnd, dev->displayName); - LVCOLUMNW c; - c.mask = LVCF_TEXT | LVCF_WIDTH; - c.cx = 151; - c.pszText = L"Control"; - ListView_InsertColumn(hWndList, 0, &c); - c.cx = 90; - c.pszText = L"Value"; - ListView_InsertColumn(hWndList, 1, &c); - ListView_DeleteAllItems(hWndList); - LVITEM item; - item.mask = LVIF_TEXT; - item.iSubItem = 0; - for (int i = 0; i < dev->numVirtualControls; i++) - { - item.pszText = dev->GetVirtualControlName(dev->virtualControls + i); - item.iItem = i; - ListView_InsertItem(hWndList, &item); - } - SetTimer(hWnd, 1, 200, 0); - } - //break; - case WM_TIMER: - { - hWndButtonProc.SetWndHandle(hWndList); - InitInfo info = {0, 1, hWnd, &hWndButtonProc}; - dm->Update(&info); - LVITEMW item; - item.mask = LVIF_TEXT; - item.iSubItem = 1; - //ShowWindow(hWndList, 0); - //LockWindowUpdate(hWndList); - if (!dev->active) - { - item.pszText = L"N/A"; - for (int i = 0; i < dev->numVirtualControls; i++) - { - item.iItem = i; - ListView_SetItem(hWndList, &item); - } - fullRefresh = 1; - } - else - { - for (int i = 0; i < dev->numVirtualControls; i++) - { - if (fullRefresh || dev->virtualControlState[i] != dev->oldVirtualControlState[i]) - { - - VirtualControl* c = dev->virtualControls + i; - wchar_t temp[50]; - int val = dev->virtualControlState[i]; - if (c->uid & (UID_POV)) - { - wsprintfW(temp, L"%i", val); - } - else - { - wchar_t* sign = L""; - if (val < 0) - { - sign = L"-"; - val = -val; - } - val = (int)floor(0.5 + val * 1000.0 / (double)FULLY_DOWN); - wsprintfW(temp, L"%s%i.%03i", sign, val / 1000, val % 1000); - } - item.pszText = temp; - item.iItem = i; - ListView_SetItem(hWndList, &item); - } - } - dm->PostRead(); - fullRefresh = 0; - } - //LockWindowUpdate(0); - //ShowWindow(hWndList, 1); - //UpdateWindow(hWnd); - } - break; - case WM_NOTIFY: - { - NMLVKEYDOWN* n = (NMLVKEYDOWN*)lParam; - // Don't always get the notification when testing DirectInput non-keyboard devices. - // Don't get it (Or want it) when testing keyboards. - if (n->hdr.idFrom != IDC_DIAG_LIST || n->hdr.code != LVN_KEYDOWN || n->wVKey != VK_ESCAPE) - break; - } - case WM_ACTIVATE: - if (uMsg == WM_ACTIVATE && wParam != WA_INACTIVE) - break; - break; - case WM_CLOSE: - KillTimer(hWnd, 1); - dm->ReleaseInput(); - // Prevents reaching this branch again. - dev = 0; - EndDialog(hWnd, 1); - break; - default: - break; - } - } - return 0; -} - -void Diagnose(int id, HWND hWnd) -{ - // init = 0; - dev = dm->devices[id]; - for (int i = 0; i < dm->numDevices; i++) - { - if (i != id) - dm->DisableDevice(i); - // Shouldn't be needed. - else - dm->EnableDevice(i); - } - DialogBox(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_DIAG), hWnd, DiagDialog); - ClearKeyQueue(); -} diff --git a/pcsx2/PAD/Windows/Diagnostics.h b/pcsx2/PAD/Windows/Diagnostics.h deleted file mode 100644 index b2bfd21bd8..0000000000 --- a/pcsx2/PAD/Windows/Diagnostics.h +++ /dev/null @@ -1,21 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef DIAGNOSTICS_H -#define DIAGNOSTICS_H - -void Diagnose(int id, HWND hWnd); - -#endif diff --git a/pcsx2/PAD/Windows/DirectInput.cpp b/pcsx2/PAD/Windows/DirectInput.cpp deleted file mode 100644 index b42100c956..0000000000 --- a/pcsx2/PAD/Windows/DirectInput.cpp +++ /dev/null @@ -1,753 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#define DIRECTINPUT_VERSION 0x0800 -#include -#include "InputManager.h" -#include "PADConfig.h" - -#include "VKey.h" -#include "DirectInput.h" -#include "DeviceEnumerator.h" -#include "common/Pcsx2Defs.h" - -// All for getting GUIDs of XInput devices.... -#include -#include -// MS's code imports wmsstd.h, thus requiring the entire windows -// media SDK also be installed for a simple macro. This is -// simpler and less silly. -#ifndef SAFE_RELEASE -#define SAFE_RELEASE(p) \ - { \ - if (p) \ - { \ - (p)->Release(); \ - (p) = NULL; \ - } \ - } -#endif - -// Aka htons, without the winsock dependency. -inline static u16 flipShort(u16 s) -{ - return (s >> 8) | (s << 8); -} - -// Aka htonl, without the winsock dependency. -inline static u32 flipLong(u32 l) -{ - return (((u32)flipShort((u16)l)) << 16) | flipShort((u16)(l >> 16)); -} - -static void GUIDtoString(wchar_t* data, const GUID* pg) -{ - wsprintfW(data, L"%08X-%04X-%04X-%04X-%04X%08X", - pg->Data1, (u32)pg->Data2, (u32)pg->Data3, - flipShort(((u16*)pg->Data4)[0]), - flipShort(((u16*)pg->Data4)[1]), - flipLong(((u32*)pg->Data4)[1])); -} - -struct DirectInput8Data -{ - IDirectInput8* lpDI8; - int refCount; - int deviceCount; -}; - -DirectInput8Data di8d = {0, 0, 0}; - -IDirectInput8* GetDirectInput() -{ - if (!di8d.lpDI8) - { - if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), 0x800, IID_IDirectInput8, (void**)&di8d.lpDI8, 0))) - return 0; - } - di8d.refCount++; - return di8d.lpDI8; -} -void ReleaseDirectInput() -{ - if (di8d.refCount) - { - di8d.refCount--; - if (!di8d.refCount) - { - di8d.lpDI8->Release(); - di8d.lpDI8 = 0; - } - } -} - -static int StringToGUID(GUID* pg, wchar_t* dataw) -{ - char data[100]; - if (wcslen(dataw) > 50) - return 0; - int w = 0; - while (dataw[w]) - { - data[w] = (char)dataw[w]; - w++; - } - data[w] = 0; - u32 temp[5]; - sscanf(data, "%08X-%04X-%04X-%04X-%04X%08X", - &pg->Data1, temp, temp + 1, - temp + 2, temp + 3, temp + 4); - pg->Data2 = (u16)temp[0]; - pg->Data3 = (u16)temp[1]; - ((u16*)pg->Data4)[0] = flipShort((u16)temp[2]); - ((u16*)pg->Data4)[1] = flipShort((u16)temp[3]); - ((u32*)pg->Data4)[1] = flipLong(temp[4]); - return 1; -} - - -struct DI8Effect -{ - IDirectInputEffect* die; - int scale; -}; - -BOOL CALLBACK EnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef); -BOOL CALLBACK EnumEffectsCallback(LPCDIEFFECTINFOW pdei, LPVOID pvRef); -class DirectInputDevice : public Device -{ -public: - DI8Effect* diEffects; - - IDirectInputDevice8* did; - GUID guidInstance; - DirectInputDevice(DeviceType type, IDirectInputDevice8* did, wchar_t* displayName, wchar_t* instanceID, wchar_t* productID, GUID guid) - : Device(DI, type, displayName, instanceID, productID) - , guidInstance(guid) - { - diEffects = 0; - this->did = 0; - did->EnumEffects(EnumEffectsCallback, this, DIEFT_ALL); - did->EnumObjects(EnumDeviceObjectsCallback, this, DIDFT_ALL); - did->Release(); - } - - void SetEffect(ForceFeedbackBinding* binding, unsigned char force) - { - int index = 0; - if (!diEffects) - { - return; - } - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - int padtype = config.padConfigs[port][slot].type; - unsigned int diff = binding - pads[port][slot][padtype].ffBindings; - if (diff < (unsigned int)pads[port][slot][padtype].numFFBindings) - { - index += diff; - port = 2; - break; - } - index += pads[port][slot][padtype].numFFBindings; - } - } - IDirectInputEffect* die = diEffects[index].die; - if (die) - { - DIEFFECT dieffect; - memset(&dieffect, 0, sizeof(dieffect)); - union - { - DIPERIODIC periodic; - DIRAMPFORCE ramp; - DICONSTANTFORCE constant; - }; - - dieffect.dwSize = sizeof(dieffect); - dieffect.lpvTypeSpecificParams = &periodic; - int magnitude = abs((int)((force * 10000 * (__int64)diEffects[index].scale) / BASE_SENSITIVITY / 255)); - if (magnitude > 10000) - magnitude = 10000; - int type = ffEffectTypes[binding->effectIndex].type; - if (type == EFFECT_CONSTANT) - { - dieffect.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); - constant.lMagnitude = magnitude; - } - else if (type == EFFECT_PERIODIC) - { - dieffect.cbTypeSpecificParams = sizeof(DIPERIODIC); - periodic.dwMagnitude = 0; - periodic.lOffset = magnitude; - periodic.dwPhase = 0; - periodic.dwPeriod = 2000000; - } - else if (type == EFFECT_RAMP) - { - dieffect.cbTypeSpecificParams = sizeof(DIRAMPFORCE); - ramp.lEnd = ramp.lStart = magnitude; - } - dieffect.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS; - dieffect.dwDuration = 2000000; - die->SetParameters(&dieffect, DIEP_TYPESPECIFICPARAMS | DIEP_START); - } - } - - int Activate(InitInfo* initInfo) - { - int i; - IDirectInput8* di8 = GetDirectInput(); - Deactivate(); - if (!di8) - return 0; - if (DI_OK != di8->CreateDevice(guidInstance, &did, 0)) - { - ReleaseDirectInput(); - did = 0; - return 0; - } - - { - DIOBJECTDATAFORMAT* formats = (DIOBJECTDATAFORMAT*)calloc(numPhysicalControls, sizeof(DIOBJECTDATAFORMAT)); - for (i = 0; i < numPhysicalControls; i++) - { - formats[i].dwType = physicalControls[i].type | DIDFT_MAKEINSTANCE(physicalControls[i].id); - formats[i].dwOfs = 4 * i; - } - DIDATAFORMAT format; - format.dwSize = sizeof(format); - format.dwDataSize = 4 * numPhysicalControls; - format.dwObjSize = sizeof(DIOBJECTDATAFORMAT); - format.dwFlags = 0; - format.dwNumObjs = numPhysicalControls; - format.rgodf = formats; - int res = did->SetDataFormat(&format); - for (i = 0; i < numPhysicalControls; i++) - { - if (physicalControls[i].type == ABSAXIS) - { - DIPROPRANGE prop; - prop.diph.dwHeaderSize = sizeof(DIPROPHEADER); - prop.diph.dwSize = sizeof(DIPROPRANGE); - prop.diph.dwObj = formats[i].dwType; - prop.diph.dwHow = DIPH_BYID; - prop.lMin = -FULLY_DOWN; - prop.lMax = FULLY_DOWN; - did->SetProperty(DIPROP_RANGE, &prop.diph); - - // May do something like this again, if there's any need. - /* - if (FAILED(DI->did->SetProperty(DIPROP_RANGE, &prop.diph))) { - if (FAILED(DI->did->GetProperty(DIPROP_RANGE, &prop.diph))) { - // ???? - DI->objects[i].min = prop.lMin; - DI->objects[i].max = prop.lMax; - continue; - } - } - DI->objects[i].min = prop.lMin; - DI->objects[i].max = prop.lMax; - //*/ - } - } - free(formats); - } - // Note: Have to use hWndTop to properly hide cursor for mouse device. - if (type == OTHER) - { - did->SetCooperativeLevel(initInfo->hWndTop, DISCL_BACKGROUND | DISCL_EXCLUSIVE); - } - else if (type == KEYBOARD) - { - did->SetCooperativeLevel(initInfo->hWndTop, DISCL_FOREGROUND); - } - else - { - did->SetCooperativeLevel(initInfo->hWndTop, DISCL_FOREGROUND | DISCL_EXCLUSIVE); - } - if (did->Acquire() != DI_OK) - { - did->Release(); - did = 0; - ReleaseDirectInput(); - return 0; - } - AllocState(); - int count = GetFFBindingCount(); - diEffects = (DI8Effect*)calloc(count, sizeof(DI8Effect)); - i = 0; - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - int padtype = config.padConfigs[port][slot].type; - int subIndex = i; - for (int j = 0; j < pads[port][slot][padtype].numFFBindings; j++) - { - ForceFeedbackBinding* b = 0; - b = &pads[port][slot][padtype].ffBindings[i - subIndex]; - ForceFeedbackEffectType* eff = ffEffectTypes + b->effectIndex; - GUID guid; - if (!StringToGUID(&guid, eff->effectID)) - continue; - - DIEFFECT dieffect; - memset(&dieffect, 0, sizeof(dieffect)); - dieffect.dwSize = sizeof(dieffect); - dieffect.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS; - dieffect.dwDuration = 1000000; - dieffect.dwGain = 10000; - dieffect.dwTriggerButton = DIEB_NOTRIGGER; - union - { - DIPERIODIC pediodic; - DIRAMPFORCE ramp; - DICONSTANTFORCE constant; - } stuff = {0, 0, 0, 0}; - - if (eff->type == EFFECT_CONSTANT) - { - dieffect.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); - } - else if (eff->type == EFFECT_PERIODIC) - { - dieffect.cbTypeSpecificParams = sizeof(DIPERIODIC); - } - else if (eff->type == EFFECT_RAMP) - { - dieffect.cbTypeSpecificParams = sizeof(DIRAMPFORCE); - } - dieffect.lpvTypeSpecificParams = &stuff; - - int maxForce = 0; - int numAxes = 0; - int* axes = (int*)malloc(sizeof(int) * 3 * numFFAxes); - DWORD* axisIDs = (DWORD*)(axes + numFFAxes); - LONG* dirList = (LONG*)(axisIDs + numFFAxes); - dieffect.rgdwAxes = axisIDs; - dieffect.rglDirection = dirList; - for (int k = 0; k < numFFAxes; k++) - { - if (b->axes[k].force) - { - int force = abs(b->axes[k].force); - if (force > maxForce) - { - maxForce = force; - } - axes[numAxes] = k; - axisIDs[numAxes] = ffAxes[k].id; - dirList[numAxes] = b->axes[k].force; - numAxes++; - } - } - if (!numAxes) - { - free(axes); - continue; - } - dieffect.cAxes = numAxes; - diEffects[i].scale = maxForce; - if (!SUCCEEDED(did->CreateEffect(guid, &dieffect, &diEffects[i].die, 0))) - { - diEffects[i].die = 0; - diEffects[i].scale = 0; - } - - free(axes); - axes = 0; - i++; - } - } - } - active = 1; - return 1; - } - - int Update() - { - if (!active) - return 0; - if (numPhysicalControls) - { - HRESULT res = did->Poll(); - // ?? - if ((res != DI_OK && res != DI_NOEFFECT) || - DI_OK != did->GetDeviceState(4 * numPhysicalControls, physicalControlState)) - { - Deactivate(); - return 0; - } - for (int i = 0; i < numPhysicalControls; i++) - { - if (physicalControls[i].type & RELAXIS) - { - physicalControlState[i] *= (FULLY_DOWN / 3); - } - else if (physicalControls[i].type & BUTTON) - { - physicalControlState[i] = (physicalControlState[i] & 0x80) * FULLY_DOWN / 128; - } - } - } - return 1; - } - - int GetFFBindingCount() - { - int count = 0; - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - int padtype = config.padConfigs[port][slot].type; - count += pads[port][slot][padtype].numFFBindings; - } - } - return count; - } - - void Deactivate() - { - FreeState(); - if (diEffects) - { - int count = GetFFBindingCount(); - for (int i = 0; i < count; i++) - { - if (diEffects[i].die) - { - diEffects[i].die->Stop(); - diEffects[i].die->Release(); - } - } - free(diEffects); - diEffects = 0; - } - if (active) - { - did->Unacquire(); - did->Release(); - ReleaseDirectInput(); - did = 0; - active = 0; - } - } - - ~DirectInputDevice() - { - } -}; - -BOOL CALLBACK EnumEffectsCallback(LPCDIEFFECTINFOW pdei, LPVOID pvRef) -{ - DirectInputDevice* did = (DirectInputDevice*)pvRef; - EffectType type; - int diType = DIEFT_GETTYPE(pdei->dwEffType); - if (diType == DIEFT_CONSTANTFORCE) - { - type = EFFECT_CONSTANT; - } - else if (diType == DIEFT_RAMPFORCE) - { - type = EFFECT_RAMP; - } - else if (diType == DIEFT_PERIODIC) - { - type = EFFECT_PERIODIC; - } - else - { - return DIENUM_CONTINUE; - } - wchar_t guidString[50]; - GUIDtoString(guidString, &pdei->guid); - did->AddFFEffectType(pdei->tszName, guidString, type); - - return DIENUM_CONTINUE; -} - -BOOL CALLBACK EnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef) -{ - DirectInputDevice* did = (DirectInputDevice*)pvRef; - if (lpddoi->dwType & DIDFT_FFACTUATOR) - { - did->AddFFAxis(lpddoi->tszName, lpddoi->dwType); - } - - ControlType type; - - if (lpddoi->dwType & DIDFT_POV) - type = POV; - else if (lpddoi->dwType & DIDFT_ABSAXIS) - type = ABSAXIS; - else if (lpddoi->dwType & DIDFT_RELAXIS) - type = RELAXIS; - else if (lpddoi->dwType & DIDFT_PSHBUTTON) - type = PSHBTN; - else if (lpddoi->dwType & DIDFT_TGLBUTTON) - type = TGLBTN; - else - return DIENUM_CONTINUE; - // If too many objects, ignore extra buttons. - if ((did->numPhysicalControls > 255 && DIDFT_GETINSTANCE(lpddoi->dwType) > 255) && (type & (DIDFT_PSHBUTTON | DIDFT_TGLBUTTON))) - { - int i; - for (i = did->numPhysicalControls - 1; i > did->numPhysicalControls - 4; i--) - { - if (!lpddoi->tszName[0]) - break; - const wchar_t* s1 = lpddoi->tszName; - const wchar_t* s2 = did->physicalControls[i].name; - while (*s1 && *s1 == *s2) - { - s1++; - s2++; - } - // If perfect match with one of last 4 names, break. - if (!*s1 && !*s2) - break; - - while (s1 != lpddoi->tszName && (s1[-1] >= '0' && s1[-1] <= '9')) - s1--; - int check = 0; - while (*s1 >= '0' && *s1 <= '9') - { - check = check * 10 + *s1 - '0'; - s1++; - } - while (*s2 >= '0' && *s2 <= '9') - { - s2++; - } - // If perfect match other than final number > 30, then break. - // takes care of "button xx" case without causing issues with F keys. - if (!*s1 && !*s2 && check > 30) - break; - } - if (i != did->numPhysicalControls - 4) - { - return DIENUM_CONTINUE; - } - } - - int vkey = 0; - if (lpddoi->tszName[0] && did->type == KEYBOARD) - { - for (u32 i = 0; i < 256; i++) - { - wchar_t* t = GetVKStringW((u8)i); - if (!wcsicmp(lpddoi->tszName, t)) - { - vkey = i; - break; - } - } - } - did->AddPhysicalControl(type, DIDFT_GETINSTANCE(lpddoi->dwType), vkey, lpddoi->tszName); - return DIENUM_CONTINUE; -} - -// Evil code from MS's site. If only they'd just made a way to get -// an XInput device's GUID directly in the first place... -BOOL IsXInputDevice(const GUID* pGuidProductFromDirectInput) -{ - IWbemLocator* pIWbemLocator = NULL; - IEnumWbemClassObject* pEnumDevices = NULL; - IWbemClassObject* pDevices[20] = {0}; - IWbemServices* pIWbemServices = NULL; - BSTR bstrNamespace = NULL; - BSTR bstrDeviceID = NULL; - BSTR bstrClassName = NULL; - DWORD uReturned = 0; - bool bIsXinputDevice = false; - UINT iDevice = 0; - VARIANT var; - HRESULT hr; - - // CoInit if needed - hr = CoInitialize(NULL); - bool bCleanupCOM = SUCCEEDED(hr); - - // Create WMI - hr = CoCreateInstance(__uuidof(WbemLocator), - NULL, - CLSCTX_INPROC_SERVER, - __uuidof(IWbemLocator), - (LPVOID*)&pIWbemLocator); - if (FAILED(hr) || pIWbemLocator == NULL) - goto LCleanup; - - bstrNamespace = SysAllocString(L"\\\\.\\root\\cimv2"); - if (bstrNamespace == NULL) - goto LCleanup; - bstrClassName = SysAllocString(L"Win32_PNPEntity"); - if (bstrClassName == NULL) - goto LCleanup; - bstrDeviceID = SysAllocString(L"DeviceID"); - if (bstrDeviceID == NULL) - goto LCleanup; - - // Connect to WMI - hr = pIWbemLocator->ConnectServer(bstrNamespace, NULL, NULL, 0L, - 0L, NULL, NULL, &pIWbemServices); - if (FAILED(hr) || pIWbemServices == NULL) - goto LCleanup; - - // Switch security level to IMPERSONATE. - CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, - RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE); - - hr = pIWbemServices->CreateInstanceEnum(bstrClassName, 0, NULL, &pEnumDevices); - if (FAILED(hr) || pEnumDevices == NULL) - goto LCleanup; - - // Loop over all devices - for (;;) - { - // Get 20 at a time - hr = pEnumDevices->Next(10000, 20, pDevices, &uReturned); - if (FAILED(hr)) - goto LCleanup; - if (uReturned == 0) - break; - - for (iDevice = 0; iDevice < uReturned; iDevice++) - { - // For each device, get its device ID - hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, NULL, NULL); - if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != NULL) - { - // Check if the device ID contains "IG_". If it does, then it's an XInput device - // This information can not be found from DirectInput - if (wcsstr(var.bstrVal, L"IG_")) - { - // If it does, then get the VID/PID from var.bstrVal - DWORD dwPid = 0, dwVid = 0; - WCHAR* strVid = wcsstr(var.bstrVal, L"VID_"); - if (strVid) - { - dwVid = wcstoul(strVid + 4, 0, 16); - } - WCHAR* strPid = wcsstr(var.bstrVal, L"PID_"); - if (strPid) - { - dwPid = wcstoul(strPid + 4, 0, 16); - } - - // Compare the VID/PID to the DInput device - DWORD dwVidPid = MAKELONG(dwVid, dwPid); - if (dwVidPid == pGuidProductFromDirectInput->Data1) - { - bIsXinputDevice = true; - goto LCleanup; - } - } - } - SAFE_RELEASE(pDevices[iDevice]); - } - } - -LCleanup: - if (bstrNamespace) - SysFreeString(bstrNamespace); - if (bstrDeviceID) - SysFreeString(bstrDeviceID); - if (bstrClassName) - SysFreeString(bstrClassName); - for (iDevice = 0; iDevice < 20; iDevice++) - SAFE_RELEASE(pDevices[iDevice]); - SAFE_RELEASE(pEnumDevices); - SAFE_RELEASE(pIWbemLocator); - SAFE_RELEASE(pIWbemServices); - - if (bCleanupCOM) - CoUninitialize(); - - return bIsXinputDevice; -} - - -struct DeviceEnumInfo -{ - IDirectInput8* di8; - int ignoreXInput; -}; - -BOOL CALLBACK EnumCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef) -{ - IDirectInput8* di8 = ((DeviceEnumInfo*)pvRef)->di8; - const wchar_t* name; - wchar_t temp[40]; - //if (((DeviceEnumInfo*)pvRef)->ignoreXInput && lpddi-> - if (lpddi->tszInstanceName[0]) - { - name = lpddi->tszInstanceName; - } - else if (lpddi->tszProductName[0]) - { - name = lpddi->tszProductName; - } - else - { - wsprintfW(temp, L"Device %i", di8d.deviceCount); - name = temp; - } - di8d.deviceCount++; - wchar_t* fullName = (wchar_t*)malloc((wcslen(name) + 4) * sizeof(wchar_t)); - wsprintf(fullName, L"DX %s", name); - wchar_t instanceID[100]; - wchar_t productID[100]; - GUIDtoString(instanceID, &lpddi->guidInstance); - GUIDtoString(productID, &lpddi->guidProduct); - DeviceType type = OTHER; - if ((lpddi->dwDevType & 0xFF) == DI8DEVTYPE_KEYBOARD) - { - type = KEYBOARD; - } - - IDirectInputDevice8* did; - if (DI_OK == di8->CreateDevice(lpddi->guidInstance, &did, 0)) - { - DirectInputDevice* dev = new DirectInputDevice(type, did, fullName, instanceID, productID, lpddi->guidInstance); - if (dev->numPhysicalControls || dev->numFFAxes) - { - dm->AddDevice(dev); - } - else - { - delete dev; - } - } - free(fullName); - return DIENUM_CONTINUE; -} - -void EnumDirectInputDevices(int ignoreXInput) -{ - DeviceEnumInfo enumInfo; - enumInfo.di8 = GetDirectInput(); - if (!enumInfo.di8) - return; - enumInfo.ignoreXInput = ignoreXInput; - di8d.deviceCount = 0; - enumInfo.di8->EnumDevices(DI8DEVCLASS_ALL, EnumCallback, &enumInfo, DIEDFL_ATTACHEDONLY); - ReleaseDirectInput(); -} diff --git a/pcsx2/PAD/Windows/DirectInput.h b/pcsx2/PAD/Windows/DirectInput.h deleted file mode 100644 index 8b1fb5aab6..0000000000 --- a/pcsx2/PAD/Windows/DirectInput.h +++ /dev/null @@ -1,16 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -void EnumDirectInputDevices(int ignoreXInput); diff --git a/pcsx2/PAD/Windows/DualShock3.cpp b/pcsx2/PAD/Windows/DualShock3.cpp deleted file mode 100644 index e90c0fa342..0000000000 --- a/pcsx2/PAD/Windows/DualShock3.cpp +++ /dev/null @@ -1,317 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "InputManager.h" -#include "PADConfig.h" - -#include "HidDevice.h" - -#define VID 0x054c -#define PID 0x0268 - -//Sixaxis driver commands. -//All commands must be sent via WriteFile with 49-byte buffer containing output report. -//Byte 0 indicates reportId and must always be 0. -//Byte 1 indicates some command, supported values are specified below. - -//This command allows to set user LEDs. -//Bytes 5,6.7.8 contain mode for corresponding LED: 0 value means LED is OFF, 1 means LEDs in ON and 2 means LEDs is flashing. -//Bytes 9-16 specify 64-bit LED flash period in 100 ns units if some LED is flashing, otherwise not used. -#define SIXAXIS_COMMAND_SET_LEDS 1 -//This command allows to set left and right motors. -//Byte 5 is right motor duration (0-255) and byte 6, if not zero, activates right motor. Zero value disables right motor. -//Byte 7 is left motor duration (0-255) and byte 8 is left motor amplitude (0-255). -#define SIXAXIS_COMMAND_SET_MOTORS 2 -//This command allows to block/unblock setting device LEDs by applications. -//Byte 5 is used as parameter - any non-zero value blocks LEDs, zero value will unblock LEDs. -#define SIXAXIS_COMMAND_BLOCK_LEDS 3 -//This command refreshes driver settings. No parameters used. -//When sixaxis driver loads it reads 'CurrentDriverSetting' binary value from 'HKLM\System\CurrentControlSet\Services\sixaxis\Parameters' registry key. -//If the key is not present then default values are used. Sending this command forces sixaxis driver to re-read the registry and update driver settings. -#define SIXAXIS_COMMAND_REFRESH_DRIVER_SETTING 9 -//This command clears current bluetooth pairing. No parameters used. -#define SIXAXIS_COMMAND_CLEAR_PAIRING 10 - -int DualShock3Possible() -{ - return 1; -} - -int CharToAxis(unsigned char c) -{ - return ((c - 128) * FULLY_DOWN) >> 7; -} - -int CharToButton(unsigned char c) -{ - const int v = (int)c + ((unsigned int)c >> 7); - return (v * FULLY_DOWN) >> 8; -} - -class DualShock3Device : public Device -{ - // Cached last vibration values by pad and motor. - // Need this, as only one value is changed at a time. - int ps2Vibration[2][4][2]; - int vibration[2]; - -public: - int index; - HANDLE hFile; - unsigned char getState[49]; - - DualShock3Device(int index, wchar_t* name, wchar_t* path) - : Device(DS3, OTHER, name, path, L"DualShock 3") - { - memset(ps2Vibration, 0, sizeof(ps2Vibration)); - vibration[0] = vibration[1] = 0; - this->index = index; - int i; - for (i = 0; i < 16; i++) - { - if (i != 14 && i != 15 && i != 8 && i != 9) - { - AddPhysicalControl(PRESSURE_BTN, i, 0); - } - else - { - AddPhysicalControl(PSHBTN, i, 0); - } - } - for (; i < 23; i++) - { - AddPhysicalControl(ABSAXIS, i, 0); - } - AddFFAxis(L"Big Motor", 0); - AddFFAxis(L"Small Motor", 1); - AddFFEffectType(L"Constant Effect", L"Constant", EFFECT_CONSTANT); - hFile = INVALID_HANDLE_VALUE; - } - - wchar_t* GetPhysicalControlName(PhysicalControl* c) - { - const static wchar_t* names[] = { - L"Square", - L"Cross", - L"Circle", - L"Triangle", - L"R1", - L"L1", - L"R2", - L"L2", - L"R3", - L"L3", - L"Left", - L"Down", - L"Right", - L"Up", - L"Start", - L"Select", - L"L-Stick X", - L"L-Stick Y", - L"R-Stick X", - L"R-Stick Y", - L"Left/Right Tilt", - L"Forward/Back Tilt", - L"???", - }; - unsigned int i = (unsigned int)(c - physicalControls); - if (i < sizeof(names) / sizeof(names[0])) - { - return (wchar_t*)names[i]; - } - return Device::GetPhysicalControlName(c); - } - - int Activate(InitInfo* initInfo) - { - if (active) - Deactivate(); - hFile = CreateFileW(instanceID, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - { - Deactivate(); - return 0; - } - active = 1; - AllocState(); - return 1; - } - - int Update() - { - if (!active) - return 0; - - unsigned char Buffer[50]; - - Buffer[0] = 0; //reportId - - if (!HidD_GetFeature(hFile, - Buffer, - sizeof(Buffer))) - { - Deactivate(); - return 0; - } - - unsigned char* getState = &Buffer[1]; - - physicalControlState[0] = CharToButton(getState[25]); //Square - physicalControlState[1] = CharToButton(getState[24]); //Cross - physicalControlState[2] = CharToButton(getState[23]); //Circle - physicalControlState[3] = CharToButton(getState[22]); //Triangle - physicalControlState[4] = CharToButton(getState[21]); //R1 - physicalControlState[5] = CharToButton(getState[20]); //L1 - physicalControlState[6] = CharToButton(getState[19]); //R2 - physicalControlState[7] = CharToButton(getState[18]); //L2 - physicalControlState[10] = CharToButton(getState[17]); //Dpad Left - physicalControlState[11] = CharToButton(getState[16]); //Dpad Down - physicalControlState[12] = CharToButton(getState[15]); //Dpad Right - physicalControlState[13] = CharToButton(getState[14]); //Dpad Up - physicalControlState[8] = ((getState[2] & 4) / 4) * FULLY_DOWN; //R3 - physicalControlState[9] = ((getState[2] & 2) / 2) * FULLY_DOWN; //L3 - physicalControlState[15] = ((getState[2] & 1) / 1) * FULLY_DOWN; //SELECT - physicalControlState[14] = ((getState[2] & 8) / 8) * FULLY_DOWN; //START - physicalControlState[16] = CharToAxis(getState[6]); //Left Stick X - physicalControlState[17] = CharToAxis(getState[7]); //Left Stick Y - physicalControlState[18] = CharToAxis(getState[8]); //Right Stick X - physicalControlState[19] = CharToAxis(getState[9]); //Right Stick Y - //Compared to libusb all sensor values on sixaxis driver are little-endian and X axis is inversed - physicalControlState[20] = CharToAxis(128 - getState[41]); //Accel X (Left/Right Tilt) - physicalControlState[21] = CharToAxis(getState[43] + 128); //Accel Y (Forward/Back Tilt) - physicalControlState[22] = CharToAxis(getState[45] + 128); //Accel Z - - return 1; - } - - void SetEffects(unsigned char port, unsigned int slot, unsigned char motor, unsigned char force) - { - ps2Vibration[port][slot][motor] = force; - vibration[0] = vibration[1] = 0; - for (int p = 0; p < 2; p++) - { - for (int s = 0; s < 4; s++) - { - int padtype = config.padConfigs[p][s].type; - for (int i = 0; i < pads[p][s][padtype].numFFBindings; i++) - { - // Technically should also be a *65535/BASE_SENSITIVITY, but that's close enough to 1 for me. - ForceFeedbackBinding* ffb = &pads[p][s][padtype].ffBindings[i]; - vibration[0] += (int)((ffb->axes[0].force * (__int64)ps2Vibration[p][s][ffb->motor]) / 255); - vibration[1] += (int)((ffb->axes[1].force * (__int64)ps2Vibration[p][s][ffb->motor]) / 255); - } - } - } - - unsigned char outputReport[49]; - - //Clear all data and set reportId to 0 - memset(outputReport, 0, sizeof(outputReport)); - - //This is command for sixaxis driver to set motors - outputReport[1] = SIXAXIS_COMMAND_SET_MOTORS; - - outputReport[5] = 0x50; //right_duration - - outputReport[6] = (unsigned char)(vibration[1] >= FULLY_DOWN / 2); //right_motor_on - - outputReport[7] = 0x50; //left_duration - - int bigForce = vibration[0] * 256 / FULLY_DOWN; - if (bigForce > 255) - bigForce = 255; - - outputReport[8] = (unsigned char)bigForce; //left_motor_force - - DWORD lpNumberOfBytesWritten = 0; - - WriteFile(hFile, outputReport, sizeof(outputReport), &lpNumberOfBytesWritten, NULL); - } - - void SetEffect(ForceFeedbackBinding* binding, unsigned char force) - { - PadBindings pBackup = pads[0][0][0]; - pads[0][0][0].ffBindings = binding; - pads[0][0][0].numFFBindings = 1; - SetEffects(0, 0, binding->motor, 255); - pads[0][0][0] = pBackup; - } - - void Deactivate() - { - if (hFile != INVALID_HANDLE_VALUE) - { - CancelIo(hFile); - CloseHandle(hFile); - hFile = INVALID_HANDLE_VALUE; - } - - memset(ps2Vibration, 0, sizeof(ps2Vibration)); - vibration[0] = vibration[1] = 0; - - FreeState(); - active = 0; - } - - ~DualShock3Device() - { - } -}; - -void EnumDualShock3s() -{ - HidDeviceInfo* foundDevs = 0; - - int numDevs = FindHids(&foundDevs, VID, PID); - if (!numDevs) - return; - int index = 0; - for (int i = 0; i < numDevs; i++) - { - if (foundDevs[i].caps.FeatureReportByteLength == 50 && - foundDevs[i].caps.OutputReportByteLength == 49) - { - HANDLE hDevice = CreateFileW(foundDevs[i].path, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, NULL); - if (hDevice != INVALID_HANDLE_VALUE) - { - unsigned char Buffer[50]; - - Buffer[0] = 0; //reportId - - if (HidD_GetFeature(hDevice, - Buffer, - sizeof(Buffer))) - { - wchar_t temp[100]; - wsprintfW(temp, L"DualShock 3 #%i", index + 1); - dm->AddDevice(new DualShock3Device(index, temp, foundDevs[i].path)); - index++; - } - - CloseHandle(hDevice); - } - } - free(foundDevs[i].path); - } - free(foundDevs); -} diff --git a/pcsx2/PAD/Windows/DualShock3.h b/pcsx2/PAD/Windows/DualShock3.h deleted file mode 100644 index 152d6dec9a..0000000000 --- a/pcsx2/PAD/Windows/DualShock3.h +++ /dev/null @@ -1,21 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -int DualShock3Possible(); -void EnumDualShock3s(); - -// May move elsewhere in the future. -int InitLibUsb(); -void UninitLibUsb(); diff --git a/pcsx2/PAD/Windows/Global.h b/pcsx2/PAD/Windows/Global.h deleted file mode 100644 index 6287746489..0000000000 --- a/pcsx2/PAD/Windows/Global.h +++ /dev/null @@ -1,125 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include -#include -#include -#include "common/Console.h" -#include "common/RedtapeWindows.h" -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "../Gamepad.h" - -struct HostKeyEvent; - -#ifdef __linux__ -// Seriously why there is no standard -#include "stdint.h" -typedef uint32_t DWORD; -typedef uint16_t USHORT; -#ifndef __INTEL_COMPILER -typedef int64_t __int64; -#endif - -#define MAX_PATH (256) // random value - -#include - -#define VK_SHIFT XK_Shift_L -#define VK_LSHIFT XK_Shift_L -#define VK_RSHIFT XK_Shift_R -#define VK_LMENU XK_Menu -#define VK_RMENU XK_Menu -#define VK_MENU XK_Menu -#define VK_CONTROL XK_Control_L -#define VK_TAB XK_Tab -#define VK_ESCAPE XK_Escape -#define VK_F4 XK_F4 - -#include -#include - -template -void wsprintfW(Array& buf, const wchar_t* format, ...) -{ - va_list a; - va_start(a, format); - - vswprintf(buf, sizeof(buf) / sizeof(buf[0]), format, a); - - va_end(a); -} - -template -void wsprintf(Array& buf, const wchar_t* format, ...) -{ - va_list a; - va_start(a, format); - - vswprintf(buf, sizeof(buf) / sizeof(buf[0]), format, a); - - va_end(a); -} - -static inline int wcsicmp(const wchar_t* w1, const wchar_t* w2) -{ - // I didn't find a way to put ignore case ... - return wcscmp(w1, w2); -} - -#include -static inline unsigned int timeGetTime() -{ - struct timeval now; - gettimeofday(&now, NULL); - uint64_t ms = (now.tv_usec / 1000) + ((uint64_t)now.tv_sec * 1000); - return (ms & 0xFFFFFFFF); // MS code is u32 ... -} - -#include "Utilities/Dependencies.h" -#include "Utilities/StringHelpers.h" -#include "Utilities/Path.h" - -#include - -extern Display* GSdsp; -extern Window GSwin; - -#endif - -#ifdef _MSC_VER -#include -#include -#include -#include -// Only needed for DBT_DEVNODES_CHANGED -#include -#endif - -// Needed for config screen -void GetNameAndVersionString(wchar_t* out); diff --git a/pcsx2/PAD/Windows/HidDevice.cpp b/pcsx2/PAD/Windows/HidDevice.cpp deleted file mode 100644 index 984ac1167d..0000000000 --- a/pcsx2/PAD/Windows/HidDevice.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "HidDevice.h" - -int FindHids(HidDeviceInfo** foundDevs, int vid, int pid) -{ - GUID GUID_DEVINTERFACE_HID; - int numFoundDevs = 0; - *foundDevs = 0; - HidD_GetHidGuid(&GUID_DEVINTERFACE_HID); - HDEVINFO hdev = SetupDiGetClassDevs(&GUID_DEVINTERFACE_HID, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); - if (hdev != INVALID_HANDLE_VALUE) - { - SP_DEVICE_INTERFACE_DATA devInterfaceData; - devInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); - for (int i = 0; SetupDiEnumDeviceInterfaces(hdev, 0, &GUID_DEVINTERFACE_HID, i, &devInterfaceData); i++) - { - - DWORD size = 0; - SetupDiGetDeviceInterfaceDetail(hdev, &devInterfaceData, 0, 0, &size, 0); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER || !size) - continue; - SP_DEVICE_INTERFACE_DETAIL_DATA* devInterfaceDetails = (SP_DEVICE_INTERFACE_DETAIL_DATA*)malloc(size); - if (!devInterfaceDetails) - continue; - - devInterfaceDetails->cbSize = sizeof(*devInterfaceDetails); - SP_DEVINFO_DATA devInfoData; - devInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - - if (!SetupDiGetDeviceInterfaceDetail(hdev, &devInterfaceData, devInterfaceDetails, size, &size, &devInfoData)) - continue; - - HANDLE hfile = CreateFile(devInterfaceDetails->DevicePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0); - if (hfile != INVALID_HANDLE_VALUE) - { - HIDD_ATTRIBUTES attributes; - attributes.Size = sizeof(attributes); - if (HidD_GetAttributes(hfile, &attributes)) - { - if (attributes.VendorID == vid && attributes.ProductID == pid) - { - PHIDP_PREPARSED_DATA pData; - HIDP_CAPS caps; - if (HidD_GetPreparsedData(hfile, &pData)) - { - if (HidP_GetCaps(pData, &caps) == HIDP_STATUS_SUCCESS) - { - if (numFoundDevs % 32 == 0) - { - *foundDevs = (HidDeviceInfo*)realloc(*foundDevs, sizeof(HidDeviceInfo) * (32 + numFoundDevs)); - } - HidDeviceInfo* dev = &foundDevs[0][numFoundDevs++]; - dev->caps = caps; - dev->vid = attributes.VendorID; - dev->pid = attributes.ProductID; - dev->path = wcsdup(devInterfaceDetails->DevicePath); - } - HidD_FreePreparsedData(pData); - } - } - } - CloseHandle(hfile); - } - free(devInterfaceDetails); - } - SetupDiDestroyDeviceInfoList(hdev); - } - return numFoundDevs; -} diff --git a/pcsx2/PAD/Windows/HidDevice.h b/pcsx2/PAD/Windows/HidDevice.h deleted file mode 100644 index 9cde5735aa..0000000000 --- a/pcsx2/PAD/Windows/HidDevice.h +++ /dev/null @@ -1,32 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef HID_DEVICE_H -#define HID_DEVICE_H - -#include -#include - -struct HidDeviceInfo -{ - HIDP_CAPS caps; - wchar_t* path; - unsigned short vid; - unsigned short pid; -}; - -int FindHids(HidDeviceInfo** foundDevs, int vid, int pid); - -#endif diff --git a/pcsx2/PAD/Windows/InputManager.cpp b/pcsx2/PAD/Windows/InputManager.cpp deleted file mode 100644 index d9c22c5a3c..0000000000 --- a/pcsx2/PAD/Windows/InputManager.cpp +++ /dev/null @@ -1,783 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "InputManager.h" -#include "KeyboardQueue.h" -#include "PADConfig.h" -#include "Host.h" - -InputDeviceManager* dm = 0; - -InputDeviceManager::InputDeviceManager() -{ - memset(this, 0, sizeof(*this)); -} - -void InputDeviceManager::ClearDevices() -{ - for (int i = 0; i < numDevices; i++) - { - delete devices[i]; - } - free(devices); - devices = 0; - numDevices = 0; -} - -InputDeviceManager::~InputDeviceManager() -{ - ClearDevices(); -} - -Device::Device(DeviceAPI api, DeviceType d, const wchar_t* displayName, const wchar_t* instanceID, const wchar_t* productID) -{ - memset(pads, 0, sizeof(pads)); - this->api = api; - type = d; - this->displayName = wcsdup(displayName); - if (instanceID) - this->instanceID = wcsdup(instanceID); - else - this->instanceID = wcsdup(displayName); - this->productID = 0; - if (productID) - this->productID = wcsdup(productID); - active = 0; - attached = 1; - enabled = 0; - -#ifdef _MSC_VER - hWndProc = 0; -#endif - - virtualControls = 0; - numVirtualControls = 0; - virtualControlState = 0; - oldVirtualControlState = 0; - - physicalControls = 0; - numPhysicalControls = 0; - physicalControlState = 0; - - ffEffectTypes = 0; - numFFEffectTypes = 0; - ffAxes = 0; - numFFAxes = 0; -} - -void Device::FreeState() -{ - if (virtualControlState) - free(virtualControlState); - virtualControlState = 0; - oldVirtualControlState = 0; - physicalControlState = 0; -} - -Device::~Device() -{ - Deactivate(); - // Generally called by deactivate, but just in case... - FreeState(); - int i; - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - for (int padtype = 0; padtype < numPadTypes; padtype++) - { - free(pads[port][slot][padtype].bindings); - for (i = 0; i < pads[port][slot][padtype].numFFBindings; i++) - { - free(pads[port][slot][padtype].ffBindings[i].axes); - } - free(pads[port][slot][padtype].ffBindings); - } - } - } - free(virtualControls); - - for (i = numPhysicalControls - 1; i >= 0; i--) - { - if (physicalControls[i].name) - free(physicalControls[i].name); - } - free(physicalControls); - - free(displayName); - free(instanceID); - free(productID); - if (ffAxes) - { - for (i = 0; i < numFFAxes; i++) - { - free(ffAxes[i].displayName); - } - free(ffAxes); - } - if (ffEffectTypes) - { - for (i = 0; i < numFFEffectTypes; i++) - { - free(ffEffectTypes[i].displayName); - free(ffEffectTypes[i].effectID); - } - free(ffEffectTypes); - } -} - -void Device::AddFFEffectType(const wchar_t* displayName, const wchar_t* effectID, EffectType type) -{ - ffEffectTypes = (ForceFeedbackEffectType*)realloc(ffEffectTypes, sizeof(ForceFeedbackEffectType) * (numFFEffectTypes + 1)); - ffEffectTypes[numFFEffectTypes].displayName = wcsdup(displayName); - ffEffectTypes[numFFEffectTypes].effectID = wcsdup(effectID); - ffEffectTypes[numFFEffectTypes].type = type; - numFFEffectTypes++; -} - -void Device::AddFFAxis(const wchar_t* displayName, int id) -{ - ffAxes = (ForceFeedbackAxis*)realloc(ffAxes, sizeof(ForceFeedbackAxis) * (numFFAxes + 1)); - ffAxes[numFFAxes].id = id; - ffAxes[numFFAxes].displayName = wcsdup(displayName); - numFFAxes++; - int bindingsExist = 0; - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - for (int padtype = 0; padtype < numPadTypes; padtype++) - { - for (int i = 0; i < pads[port][slot][padtype].numFFBindings; i++) - { - ForceFeedbackBinding* b = pads[port][slot][padtype].ffBindings + i; - b->axes = (AxisEffectInfo*)realloc(b->axes, sizeof(AxisEffectInfo) * (numFFAxes)); - memset(b->axes + (numFFAxes - 1), 0, sizeof(AxisEffectInfo)); - bindingsExist = 1; - } - } - } - } - // Generally the case when not loading a binding file. - if (!bindingsExist) - { - int i = numFFAxes - 1; - ForceFeedbackAxis temp = ffAxes[i]; - while (i && temp.id < ffAxes[i - 1].id) - { - ffAxes[i] = ffAxes[i - 1]; - i--; - } - ffAxes[i] = temp; - } -} - -void Device::AllocState() -{ - FreeState(); - virtualControlState = (int*)calloc(numVirtualControls + numVirtualControls + numPhysicalControls, sizeof(int)); - oldVirtualControlState = virtualControlState + numVirtualControls; - physicalControlState = oldVirtualControlState + numVirtualControls; -} - -void Device::FlipState() -{ - memcpy(oldVirtualControlState, virtualControlState, sizeof(int) * numVirtualControls); -} - -void Device::PostRead() -{ - FlipState(); -} - -void Device::CalcVirtualState() -{ - for (int i = 0; i < numPhysicalControls; i++) - { - PhysicalControl* c = physicalControls + i; - int index = c->baseVirtualControlIndex; - int val = physicalControlState[i]; - if (c->type & BUTTON) - { - virtualControlState[index] = val; - // DirectInput keyboard events only. - if (this->api == DI && this->type == KEYBOARD) - { - if (!(virtualControlState[index] >> 15) != !(oldVirtualControlState[index] >> 15) && c->vkey) - { - // Check for alt-F4 to avoid toggling skip mode incorrectly. - if (c->vkey == VK_F4) - { - int i; - for (i = 0; i < numPhysicalControls; i++) - { - if (virtualControlState[physicalControls[i].baseVirtualControlIndex] && - (physicalControls[i].vkey == VK_MENU || - physicalControls[i].vkey == VK_RMENU || - physicalControls[i].vkey == VK_LMENU)) - { - break; - } - } - if (i < numPhysicalControls) - continue; - } - HostKeyEvent::Type event = HostKeyEvent::Type::KeyPressed; - if (!(virtualControlState[index] >> 15)) - event = HostKeyEvent::Type::KeyReleased; - QueueKeyEvent(c->vkey, event); - } - } - } - else if (c->type & ABSAXIS) - { - virtualControlState[index] = (val + FULLY_DOWN) / 2; - // Positive. Overkill. - virtualControlState[index + 1] = (val & ~(val >> 31)); - // Negative - virtualControlState[index + 2] = (-val & (val >> 31)); - } - else if (c->type & RELAXIS) - { - int delta = val - oldVirtualControlState[index]; - virtualControlState[index] = val; - // Positive - virtualControlState[index + 1] = (delta & ~(delta >> 31)); - // Negative - virtualControlState[index + 2] = (-delta & (delta >> 31)); - } - else if (c->type & POV) - { - virtualControlState[index] = val; - int iSouth = 0; - int iEast = 0; - if ((unsigned int)val <= 37000) - { - double angle = val * (3.141592653589793 / 18000.0); - double East = sin(angle); - double South = -cos(angle); - // Normalize so greatest direction is 1. - double mul = FULLY_DOWN / std::max(fabs(South), fabs(East)); - - iEast = (int)floor(East * mul + 0.5); - iSouth = (int)floor(South * mul + 0.5); - } - // N - virtualControlState[index + 1] = (-iSouth & (iSouth >> 31)); - // S - virtualControlState[index + 3] = (iSouth & ~(iSouth >> 31)); - // E - virtualControlState[index + 2] = (iEast & ~(iEast >> 31)); - // W - virtualControlState[index + 4] = (-iEast & (iEast >> 31)); - } - } -} - -VirtualControl* Device::GetVirtualControl(unsigned int uid) -{ - for (int i = 0; i < numVirtualControls; i++) - { - if (virtualControls[i].uid == uid) - return virtualControls + i; - } - return 0; -} - -VirtualControl* Device::AddVirtualControl(unsigned int uid, int physicalControlIndex) -{ - // Not really necessary, as always call AllocState when activated, but doesn't hurt. - FreeState(); - - if (numVirtualControls % 16 == 0) - { - virtualControls = (VirtualControl*)realloc(virtualControls, sizeof(VirtualControl) * (numVirtualControls + 16)); - } - VirtualControl* c = virtualControls + numVirtualControls; - - c->uid = uid; - c->physicalControlIndex = physicalControlIndex; - - numVirtualControls++; - return c; -} - -PhysicalControl* Device::AddPhysicalControl(ControlType type, unsigned short id, unsigned short vkey, const wchar_t* name) -{ - // Not really necessary, as always call AllocState when activated, but doesn't hurt. - FreeState(); - - if (numPhysicalControls % 16 == 0) - { - physicalControls = (PhysicalControl*)realloc(physicalControls, sizeof(PhysicalControl) * (numPhysicalControls + 16)); - } - PhysicalControl* control = physicalControls + numPhysicalControls; - - memset(control, 0, sizeof(PhysicalControl)); - control->type = type; - control->id = id; - if (name) - control->name = wcsdup(name); - control->baseVirtualControlIndex = numVirtualControls; - unsigned int uid = id | (type << 16); - if (type & BUTTON) - { - AddVirtualControl(uid, numPhysicalControls); - control->vkey = vkey; - } - else if (type & AXIS) - { - AddVirtualControl(uid | UID_AXIS, numPhysicalControls); - AddVirtualControl(uid | UID_AXIS_POS, numPhysicalControls); - AddVirtualControl(uid | UID_AXIS_NEG, numPhysicalControls); - } - else if (type & POV) - { - AddVirtualControl(uid | UID_POV, numPhysicalControls); - AddVirtualControl(uid | UID_POV_N, numPhysicalControls); - AddVirtualControl(uid | UID_POV_E, numPhysicalControls); - AddVirtualControl(uid | UID_POV_S, numPhysicalControls); - AddVirtualControl(uid | UID_POV_W, numPhysicalControls); - } - numPhysicalControls++; - return control; -} - -void Device::SetEffects(unsigned char port, unsigned int slot, unsigned char motor, unsigned char force) -{ - int padtype = config.padConfigs[port][slot].type; - for (int i = 0; i < pads[port][slot][padtype].numFFBindings; i++) - { - ForceFeedbackBinding* binding = pads[port][slot][padtype].ffBindings + i; - if (binding->motor == motor) - { - SetEffect(binding, force); - } - } -} - -wchar_t* GetDefaultControlName(unsigned short id, int type) -{ - static wchar_t name[20]; - if (type & BUTTON) - { - wsprintfW(name, L"Button %i", id); - } - else if (type & AXIS) - { - wsprintfW(name, L"Axis %i", id); - } - else if (type & POV) - { - wsprintfW(name, L"POV %i", id); - } - else - { - wcscpy(name, L"Unknown"); - } - return name; -} - -wchar_t* Device::GetVirtualControlName(VirtualControl* control) -{ - static wchar_t temp[100]; - wchar_t* baseName = 0; - if (control->physicalControlIndex >= 0) - { - baseName = physicalControls[control->physicalControlIndex].name; - if (!baseName) - baseName = GetPhysicalControlName(&physicalControls[control->physicalControlIndex]); - } - unsigned int uid = control->uid; - if (!baseName) - { - baseName = GetDefaultControlName(uid & 0xFFFF, (uid >> 16) & 0x1F); - } - uid &= 0xFF000000; - int len = (int)wcslen(baseName); - if (len > 99) - len = 99; - memcpy(temp, baseName, len * sizeof(wchar_t)); - temp[len] = 0; - if (uid) - { - if (len > 95) - len = 95; - wchar_t* out = temp + len; - if (uid == UID_AXIS_POS) - { - wcscpy(out, L" +"); - } - else if (uid == UID_AXIS_NEG) - { - wcscpy(out, L" -"); - } - else if (uid == UID_POV_N) - { - wcscpy(out, L" N"); - } - else if (uid == UID_POV_E) - { - wcscpy(out, L" E"); - } - else if (uid == UID_POV_S) - { - wcscpy(out, L" S"); - } - else if (uid == UID_POV_W) - { - wcscpy(out, L" W"); - } - } - return temp; -} - -wchar_t* Device::GetPhysicalControlName(PhysicalControl* control) -{ - if (control->name) - return control->name; - return GetDefaultControlName(control->id, control->type); -} - -void InputDeviceManager::AddDevice(Device* d) -{ - devices = (Device**)realloc(devices, sizeof(Device*) * (numDevices + 1)); - devices[numDevices++] = d; -} - -void InputDeviceManager::Update(InitInfo* info) -{ - for (int i = 0; i < numDevices; i++) - { - if (devices[i]->enabled) - { - if (!devices[i]->active) - { - if (!devices[i]->Activate(info) || !devices[i]->Update()) - continue; - devices[i]->CalcVirtualState(); - devices[i]->PostRead(); - } - if (devices[i]->Update()) - devices[i]->CalcVirtualState(); - } - } -} - -void InputDeviceManager::PostRead() -{ - for (int i = 0; i < numDevices; i++) - { - if (devices[i]->active) - devices[i]->PostRead(); - } -} - -Device* InputDeviceManager::GetActiveDevice(InitInfo* info, unsigned int* uid, int* index, int* value) -{ - int i, j; - Update(info); - int bestDiff = FULLY_DOWN / 2; - Device* bestDevice = 0; - for (i = 0; i < numDevices; i++) - { - if (devices[i]->active) - { - for (j = 0; j < devices[i]->numVirtualControls; j++) - { - if (devices[i]->virtualControlState[j] == devices[i]->oldVirtualControlState[j]) - continue; - if (devices[i]->virtualControls[j].uid & UID_POV) - continue; - // Fix for releasing button used to click on bind button - if (!((devices[i]->virtualControls[j].uid >> 16) & (POV | RELAXIS | ABSAXIS))) - { - if (abs(devices[i]->oldVirtualControlState[j]) > abs(devices[i]->virtualControlState[j])) - { - devices[i]->oldVirtualControlState[j] = 0; - } - } - int diff = abs(devices[i]->virtualControlState[j] - devices[i]->oldVirtualControlState[j]); - // Make it require a bit more work to bind relative axes. - if (((devices[i]->virtualControls[j].uid >> 16) & 0xFF) == RELAXIS) - { - diff = diff / 4 + 1; - } - // Less pressure needed to bind DS3/SCP buttons. - if ((devices[i]->api == DS3 || devices[i]->api == XINPUT) && (((devices[i]->virtualControls[j].uid >> 16) & 0xFF) & BUTTON)) - { - diff *= 4; - } - if (diff > bestDiff) - { - if (devices[i]->virtualControls[j].uid & UID_AXIS) - { - if ((((devices[i]->virtualControls[j].uid >> 16) & 0xFF) != ABSAXIS)) - continue; - // Very picky when binding entire axes. Prefer binding half-axes. - if (!((devices[i]->oldVirtualControlState[j] < FULLY_DOWN / 32 && devices[i]->virtualControlState[j] > FULLY_DOWN / 8) || - (devices[i]->oldVirtualControlState[j] > 31 * FULLY_DOWN / 32 && devices[i]->virtualControlState[j] < 7 * FULLY_DOWN / 8))) - { - continue; - } - } - else if ((((devices[i]->virtualControls[j].uid >> 16) & 0xFF) == ABSAXIS)) - { - if (devices[i]->oldVirtualControlState[j] > 15 * FULLY_DOWN / 16) - continue; - } - bestDiff = diff; - *uid = devices[i]->virtualControls[j].uid; - *index = j; - bestDevice = devices[i]; - if (value) - { - if ((devices[i]->virtualControls[j].uid >> 16) & RELAXIS) - { - *value = devices[i]->virtualControlState[j] - devices[i]->oldVirtualControlState[j]; - } - else - { - *value = devices[i]->virtualControlState[j]; - } - } - } - } - } - } - // Don't call when binding. - // PostRead(); - return bestDevice; -} - -void InputDeviceManager::ReleaseInput() -{ - for (int i = 0; i < numDevices; i++) - { - if (devices[i]->active) - devices[i]->Deactivate(); - } -} - -void InputDeviceManager::EnableDevices(DeviceType type, DeviceAPI api) -{ - for (int i = 0; i < numDevices; i++) - { - if (devices[i]->api == api && devices[i]->type == type) - { - EnableDevice(i); - } - } -} - -void InputDeviceManager::DisableAllDevices() -{ - for (int i = 0; i < numDevices; i++) - { - DisableDevice(i); - } -} - -void InputDeviceManager::DisableDevice(int index) -{ - devices[index]->enabled = 0; - if (devices[index]->active) - { - devices[index]->Deactivate(); - } -} - -ForceFeedbackEffectType* Device::GetForcefeedbackEffect(wchar_t* id) -{ - for (int i = 0; i < numFFEffectTypes; i++) - { - if (!wcsicmp(id, ffEffectTypes[i].effectID)) - { - return &ffEffectTypes[i]; - } - } - return 0; -} - -ForceFeedbackAxis* Device::GetForceFeedbackAxis(int id) -{ - for (int i = 0; i < numFFAxes; i++) - { - if (ffAxes[i].id == id) - return &ffAxes[i]; - } - return 0; -} - -void InputDeviceManager::CopyBindings(int numOldDevices, Device** oldDevices) -{ - int* oldMatches = (int*)malloc(sizeof(int) * numOldDevices); - int* matches = (int*)malloc(sizeof(int) * numDevices); - int i, j, port, slot; - Device *old, *dev; - for (i = 0; i < numDevices; i++) - { - matches[i] = -1; - } - for (i = 0; i < numOldDevices; i++) - { - oldMatches[i] = -2; - old = oldDevices[i]; - for (port = 0; port < 2; port++) - { - for (slot = 0; slot < 4; slot++) - { - for (int padtype = 0; padtype < numPadTypes; padtype++) - { - if (old->pads[port][slot][padtype].numBindings + old->pads[port][slot][padtype].numFFBindings) - { - // Means that there are bindings. - oldMatches[i] = -1; - } - } - } - } - } - // Loops through ids looking for match, from most specific to most general. - for (int id = 0; id < 3; id++) - { - for (i = 0; i < numOldDevices; i++) - { - if (oldMatches[i] >= 0) - continue; - for (j = 0; j < numDevices; j++) - { - if (matches[j] >= 0) - { - continue; - } - wchar_t* id1 = devices[j]->IDs[id]; - wchar_t* id2 = oldDevices[i]->IDs[id]; - if (!id1 || !id2) - { - continue; - } - if (!wcsicmp(id1, id2)) - { - matches[j] = i; - oldMatches[i] = j; - break; - } - } - } - } - - for (i = 0; i < numOldDevices; i++) - { - if (oldMatches[i] == -2) - continue; - old = oldDevices[i]; - if (oldMatches[i] < 0) - { - dev = new Device(old->api, old->type, old->displayName, old->instanceID, old->productID); - dev->attached = 0; - AddDevice(dev); - for (j = 0; j < old->numVirtualControls; j++) - { - VirtualControl* c = old->virtualControls + j; - dev->AddVirtualControl(c->uid, -1); - } - for (j = 0; j < old->numFFEffectTypes; j++) - { - ForceFeedbackEffectType* effect = old->ffEffectTypes + j; - dev->AddFFEffectType(effect->displayName, effect->effectID, effect->type); - } - for (j = 0; j < old->numFFAxes; j++) - { - ForceFeedbackAxis* axis = old->ffAxes + j; - dev->AddFFAxis(axis->displayName, axis->id); - } - // Just steal the old bindings directly when there's no matching device. - // Indices will be the same. - memcpy(dev->pads, old->pads, sizeof(old->pads)); - memset(old->pads, 0, sizeof(old->pads)); - } - else - { - dev = devices[oldMatches[i]]; - for (port = 0; port < 2; port++) - { - for (slot = 0; slot < 4; slot++) - { - for (int padtype = 0; padtype < numPadTypes; padtype++) - { - if (old->pads[port][slot][padtype].numBindings) - { - dev->pads[port][slot][padtype].bindings = (Binding*)malloc(old->pads[port][slot][padtype].numBindings * sizeof(Binding)); - for (int j = 0; j < old->pads[port][slot][padtype].numBindings; j++) - { - Binding* bo = old->pads[port][slot][padtype].bindings + j; - Binding* bn = dev->pads[port][slot][padtype].bindings + dev->pads[port][slot][padtype].numBindings; - VirtualControl* cn = dev->GetVirtualControl(old->virtualControls[bo->controlIndex].uid); - if (cn) - { - *bn = *bo; - bn->controlIndex = cn - dev->virtualControls; - dev->pads[port][slot][padtype].numBindings++; - } - } - } - if (old->pads[port][slot][padtype].numFFBindings) - { - dev->pads[port][slot][padtype].ffBindings = (ForceFeedbackBinding*)malloc(old->pads[port][slot][padtype].numFFBindings * sizeof(ForceFeedbackBinding)); - for (int j = 0; j < old->pads[port][slot][padtype].numFFBindings; j++) - { - ForceFeedbackBinding* bo = old->pads[port][slot][padtype].ffBindings + j; - ForceFeedbackBinding* bn = dev->pads[port][slot][padtype].ffBindings + dev->pads[port][slot][padtype].numFFBindings; - ForceFeedbackEffectType* en = dev->GetForcefeedbackEffect(old->ffEffectTypes[bo->effectIndex].effectID); - if (en) - { - *bn = *bo; - bn->effectIndex = en - dev->ffEffectTypes; - bn->axes = (AxisEffectInfo*)calloc(dev->numFFAxes, sizeof(AxisEffectInfo)); - for (int k = 0; k < old->numFFAxes; k++) - { - ForceFeedbackAxis* newAxis = dev->GetForceFeedbackAxis(old->ffAxes[k].id); - if (newAxis) - { - bn->axes[newAxis - dev->ffAxes] = bo->axes[k]; - } - } - dev->pads[port][slot][padtype].numFFBindings++; - } - } - } - } - } - } - } - } - free(oldMatches); - free(matches); -} - -void InputDeviceManager::SetEffect(unsigned char port, unsigned int slot, unsigned char motor, unsigned char force) -{ - for (int i = 0; i < numDevices; i++) - { - Device* dev = devices[i]; - if (dev->enabled && dev->numFFEffectTypes) - { - dev->SetEffects(port, slot, motor, force); - } - } -} diff --git a/pcsx2/PAD/Windows/InputManager.h b/pcsx2/PAD/Windows/InputManager.h deleted file mode 100644 index 640515fc76..0000000000 --- a/pcsx2/PAD/Windows/InputManager.h +++ /dev/null @@ -1,407 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef INPUT_MANAGER_H -#define INPUT_MANAGER_H - -// Both of these are hard coded in a lot of places, so don't modify them. -// Base sensitivity means that a sensitivity of that corresponds to a factor of 1. -// Fully down means that value corresponds to a button being fully down (255). -// a value of 128 or more corresponds to that button being pressed, for binary -// values. -#define BASE_SENSITIVITY (1 << 16) -#define BASE_ANALOG_SENSITIVITY (87183) -#define FULLY_DOWN (1 << 16) - -#define DEFAULT_DEADZONE (BASE_SENSITIVITY * 201 / 1000) - -/* Idea is for this file and the associated cpp file to be Windows independent. - * Still more effort than it's worth to port to Linux, however. - */ - -enum PadType -{ - DisabledPad, - Dualshock2Pad, - GuitarPad, - PopnPad, - MousePad, - neGconPad, - numPadTypes // total number of PadTypes. Add new PadType above this line. -}; - -// Mostly match DirectInput8 values. Note that these are for physical controls. -// One physical axis maps to 3 virtual ones, and one physical POV control maps to -// 4 virtual ones. -enum ControlType -{ - NO_CONTROL = 0, - // Axes are ints. Relative axes are for mice, mice wheels, etc, - // and are always reported relative to their last value. - // Absolute axes range from -65536 to 65536 and are absolute positions, - // like for joysticks and pressure sensitive buttons. - RELAXIS = 1, - ABSAXIS = 2, - - // Buttons range from 0 to 65536. - PSHBTN = 4, - TGLBTN = 8, - - // POV controls are ints, values range from -1 to 36000. - // -1 means not pressed, otherwise it's an angle. - // For easy DirectInput compatibility, anything outside. - // that range is treated as -1 (Though 36000-37000 is treated - // like 0 to 1000, just in case). - POV = 16, - - // Pressure sensitive buttons. Only a different type because - // they have configurable dead zones, unlike push or toggle buttons. - PRESSURE_BTN = 32, -}; - -// Masks to determine button type. Don't need one for POV. -#define BUTTON (PSHBTN | TGLBTN | PRESSURE_BTN) -#define BINARY_BUTTON (PSHBTN | TGLBTN) -#define AXIS 3 - -struct Binding -{ - int controlIndex; - int command; - int sensitivity; - int deadZone; - int skipDeadZone; - unsigned char rapidFire; -}; - -#define UID_AXIS (1U << 31) -#define UID_POV (1 << 30) - -#define UID_AXIS_POS (1U << 24) -#define UID_AXIS_NEG (2U << 24) -#define UID_POV_N (3 << 24) -#define UID_POV_E (4 << 24) -#define UID_POV_S (5 << 24) -#define UID_POV_W (6 << 24) - -// One of these exists for each bindable object. -// Bindable objects consist of buttons, axis, pov controls, -// and individual axis/pov directions. Not that pov controls -// cannot actually be bound, but when trying to bind as an axis, -// all directions are assigned individually. -struct VirtualControl -{ - // Unique id for control, given device. Based on source control's id, - // source control type, axis/pov flags if it's a pov/axis (Rather than - // a button or a pov/axis control's individual button), and an index, - // if the control is split. - unsigned int uid; - // virtual key code. 0 if none. - int physicalControlIndex; -}; - -// Need one for each button, axis, and pov control. -// API-specific code creates the PhysicalControls and -// updates their state, standard function then populates -// the VirtualControls and queues the keyboard messages, if -// needed. -struct PhysicalControl -{ - // index of the first virtual control corresponding to this. - // Buttons have 1 virtual control, axes 3, and povs 5, all - // in a row. - int baseVirtualControlIndex; - ControlType type; - // id. Must be unique for control type. - // short so can be combined with other values to get - // uid for virtual controls. - unsigned short id; - unsigned short vkey; - wchar_t* name; -}; - -enum DeviceAPI -{ - NO_API = 0, - DI = 1, - WM = 2, - RAW = 3, - XINPUT = 4, - DS3 = 5, - // Not currently used. - LLHOOK = 6, - // Not a real API, obviously. Only used with keyboards, - // to ignore individual buttons. Wrapper itself takes care - // of ignoring bound keys. Otherwise, works normally. - IGNORE_KEYBOARD = 7, - // XXX - LNX_KEYBOARD = 16, - LNX_JOY = 17, -}; - -enum DeviceType -{ - NO_DEVICE = 0, - KEYBOARD = 1, - MOUSE = 2, - OTHER = 3 -}; - -enum EffectType -{ - EFFECT_CONSTANT, - EFFECT_PERIODIC, - EFFECT_RAMP -}; - -// force range sfrom -BASE_SENSITIVITY to BASE_SENSITIVITY. -// Order matches ForceFeedbackAxis order. force of 0 means to -// ignore that axis completely. Force of 1 or -1 means to initialize -// the axis with minimum force (Possibly 0 force), if applicable. -struct AxisEffectInfo -{ - int force; -}; - -struct ForceFeedbackBinding -{ - AxisEffectInfo* axes; - int effectIndex; - unsigned char motor; -}; - -// Bindings listed by effect, so I don't have to bother with -// indexing effects. -struct ForceFeedbackEffectType -{ - wchar_t* displayName; - // Because I'm lazy, can only have ASCII characters and no spaces. - wchar_t* effectID; - // constant, ramp, or periodic - EffectType type; -}; - - -struct ForceFeedbackAxis -{ - wchar_t* displayName; - int id; -}; - -// Used both for active devices and for sets of settings for devices. -// Way things work: -// LoadSettings() will delete all device info, then load settings to get -// one set of generic devices. Then I enumerate all devices. Then I merge -// them, moving settings from the generic devices to the enumerated ones. - -struct PadBindings -{ - Binding* bindings; - int numBindings; - ForceFeedbackBinding* ffBindings; - int numFFBindings; -}; - -class WndProcEater; - -struct InitInfo -{ - // 1 when binding key to ignore. - int bindingIgnore; - // 1 when binding. - int binding; - -#ifdef _MSC_VER - HWND hWndTop; - - // For config screen, need to eat button's message handling. - //HWND hWndButton; - - WndProcEater* hWndProc; -#else - // Linux equivalent to HWND - Display* GSdsp; - Window GSwin; -#endif -}; - - -// Mostly self-contained, but bindings are modified by config.cpp, to make -// updating the ListView simpler. -class Device -{ -public: - DeviceAPI api; - DeviceType type; - char active; - char attached; - // Based on input modes. - char enabled; - -#ifdef _MSC_VER - // Not all devices need to subclass the windproc, but most do so might as well - // put it here... --air - WndProcEater* hWndProc; -#endif - - union - { - // Allows for one loop to compare all 3 in order. - wchar_t* IDs[3]; - struct - { - // Same as DisplayName, when not given. Absolutely must be unique. - // Used for loading/saving controls. If matches, all other strings - // are ignored, so must be unique. - wchar_t* instanceID; - // Not required. Used when a device's instance id changes, doesn't have to - // be unique. For devices that can only have one instance, not needed. - wchar_t* productID; - - wchar_t* displayName; - }; - }; - - PadBindings pads[2][4][numPadTypes]; - - // Virtual controls. All basically act like pressure sensitivity buttons, with - // values between 0 and 2^16. 2^16 is fully down, 0 is up. Larger values - // are allowed, but *only* for absolute axes (Which don't support the flip checkbox). - // Each control on a device must have a unique id, used for binding. - VirtualControl* virtualControls; - int numVirtualControls; - - int* virtualControlState; - int* oldVirtualControlState; - - PhysicalControl* physicalControls; - int numPhysicalControls; - int* physicalControlState; - - ForceFeedbackEffectType* ffEffectTypes; - int numFFEffectTypes; - ForceFeedbackAxis* ffAxes; - int numFFAxes; - void AddFFAxis(const wchar_t* displayName, int id); - void AddFFEffectType(const wchar_t* displayName, const wchar_t* effectID, EffectType type); - - Device(DeviceAPI, DeviceType, const wchar_t* displayName, const wchar_t* instanceID = 0, const wchar_t* deviceID = 0); - virtual ~Device(); - - // Allocates memory for old and new state, sets everything to 0. - // all old states are in one array, buttons, axes, and then POVs. - // start of each section is int aligned. This makes it DirectInput - // compatible. - void AllocState(); - - // Doesn't actually flip. Copies current state to old state. - void FlipState(); - - // Frees state variables. - void FreeState(); - - ForceFeedbackEffectType* GetForcefeedbackEffect(wchar_t* id); - ForceFeedbackAxis* GetForceFeedbackAxis(int id); - - VirtualControl* GetVirtualControl(unsigned int uid); - - PhysicalControl* AddPhysicalControl(ControlType type, unsigned short id, unsigned short vkey, const wchar_t* name = 0); - VirtualControl* AddVirtualControl(unsigned int uid, int physicalControlIndex); - - virtual wchar_t* GetVirtualControlName(VirtualControl* c); - virtual wchar_t* GetPhysicalControlName(PhysicalControl* c); - - void CalcVirtualState(); - - virtual int Activate(InitInfo* args) - { - return 0; - } - - inline virtual void Deactivate() - { - FreeState(); - active = 0; - } - - // Default update proc. All that's needed for post-based APIs. - inline virtual int Update() - { - return active; - } - - // force is from -FULLY_DOWN to FULLY_DOWN. - // Either function can be overridden. Second one by default calls the first - // for every bound effect that's affected. - - // Note: Only used externally for binding, so if override the other one, can assume - // all other forces are currently 0. - inline virtual void SetEffect(ForceFeedbackBinding* binding, unsigned char force) {} - virtual void SetEffects(unsigned char port, unsigned int slot, unsigned char motor, unsigned char force); - - // Called after reading. Basically calls FlipState(). - // Some device types (Those that don't incrementally update) - // could call FlipState elsewhere, but this makes it simpler to ignore - // while binding. - virtual void PostRead(); -}; - -class InputDeviceManager -{ -public: - Device** devices; - int numDevices; - - void ClearDevices(); - - // When refreshing devices, back up old devices, then - // populate this with new devices, then call copy bindings. - // All old bindings are copied to matching devices. - - // When old devices are missing, I do a slightly more careful search - // using productIDs and then (in desperation) displayName. - // Finally create new dummy devices if no matches found. - void CopyBindings(int numDevices, Device** devices); - - - InputDeviceManager(); - ~InputDeviceManager(); - - void AddDevice(Device* d); - Device* GetActiveDevice(InitInfo* info, unsigned int* uid, int* index, int* value); - void Update(InitInfo* initInfo); - - // Called after reading state, after Update(). - void PostRead(); - - void SetEffect(unsigned char port, unsigned int slot, unsigned char motor, unsigned char force); - - // Update does this as needed. - // void GetInput(void *v); - void ReleaseInput(); - - void DisableDevice(int index); - inline void EnableDevice(int i) - { - devices[i]->enabled = 1; - } - - void EnableDevices(DeviceType type, DeviceAPI api); - void DisableAllDevices(); -}; - -extern InputDeviceManager* dm; - -#endif diff --git a/pcsx2/PAD/Windows/KeyboardQueue.cpp b/pcsx2/PAD/Windows/KeyboardQueue.cpp deleted file mode 100644 index 46a0b63e1c..0000000000 --- a/pcsx2/PAD/Windows/KeyboardQueue.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -// This is undoubtedly completely unnecessary. -#include "KeyboardQueue.h" - -static std::mutex cSection; - -#define EVENT_QUEUE_LEN 16 -// Actually points one beyond the last queued event. -static u8 lastQueuedEvent = 0; -static u8 nextQueuedEvent = 0; -static HostKeyEvent queuedEvents[EVENT_QUEUE_LEN]; - -void QueueKeyEvent(u32 key, HostKeyEvent::Type event) -{ - std::lock_guard lock(cSection); - - // Don't queue events if escape is on top of queue. This is just for safety - // purposes when a game is killing the emulator for whatever reason. - if (nextQueuedEvent == lastQueuedEvent || - queuedEvents[nextQueuedEvent].key != VK_ESCAPE || - queuedEvents[nextQueuedEvent].type != HostKeyEvent::Type::KeyPressed) - { - // Clear queue on escape down, bringing escape to front. May do something - // with shift/ctrl/alt and F-keys, later. - if (event == HostKeyEvent::Type::KeyPressed && key == VK_ESCAPE) - { - nextQueuedEvent = lastQueuedEvent; - } - - queuedEvents[lastQueuedEvent].key = key; - queuedEvents[lastQueuedEvent].type = event; - - lastQueuedEvent = (lastQueuedEvent + 1) % EVENT_QUEUE_LEN; - // If queue wrapped around, remove last element. - if (nextQueuedEvent == lastQueuedEvent) - { - nextQueuedEvent = (nextQueuedEvent + 1) % EVENT_QUEUE_LEN; - } - } -} - -int GetQueuedKeyEvent(HostKeyEvent* event) -{ - if (lastQueuedEvent == nextQueuedEvent) - return 0; - - std::lock_guard lock(cSection); - - *event = queuedEvents[nextQueuedEvent]; - nextQueuedEvent = (nextQueuedEvent + 1) % EVENT_QUEUE_LEN; - return 1; -} - -void ClearKeyQueue() -{ - lastQueuedEvent = nextQueuedEvent; -} diff --git a/pcsx2/PAD/Windows/KeyboardQueue.h b/pcsx2/PAD/Windows/KeyboardQueue.h deleted file mode 100644 index b352814eb8..0000000000 --- a/pcsx2/PAD/Windows/KeyboardQueue.h +++ /dev/null @@ -1,32 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - - -// This entire thing isn't really needed, -// but takes little enough effort to be safe... - -#include "Host.h" - -void QueueKeyEvent(u32 key, HostKeyEvent::Type event); -int GetQueuedKeyEvent(HostKeyEvent* event); - -// Cleans up as well as clears queue. -void ClearKeyQueue(); - -#ifdef __linux__ -void R_QueueKeyEvent(const HostKeyEvent& event); -int R_GetQueuedKeyEvent(HostKeyEvent* event); -void R_ClearKeyQueue(); -#endif diff --git a/pcsx2/PAD/Windows/PAD.cpp b/pcsx2/PAD/Windows/PAD.cpp deleted file mode 100644 index 612551f123..0000000000 --- a/pcsx2/PAD/Windows/PAD.cpp +++ /dev/null @@ -1,1619 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "Common/WindowInfo.h" - -#include -#include -#include - -#include "resource_pad.h" -#include "InputManager.h" -#include "PADConfig.h" -#include "Host.h" - -#include "DeviceEnumerator.h" -#ifdef _MSC_VER -#include "WndProcEater.h" -#include "HidDevice.h" -#endif -#include "KeyboardQueue.h" -#include "DualShock3.h" - -#ifndef PCSX2_CORE -#include "gui/AppCoreThread.h" -#endif - -#define WMA_FORCE_UPDATE (WM_APP + 0x537) -#define FORCE_UPDATE_WPARAM ((WPARAM)0x74328943) -#define FORCE_UPDATE_LPARAM ((LPARAM)0x89437437) - -static WindowInfo s_window_info; - -#ifdef _WIN32 -HWND hWndTop; - -WndProcEater hWndGSProc; -WndProcEater hWndTopProc; - -// ButtonProc is used mostly by the Config panel for eating the procedures of the -// button with keyboard focus. -WndProcEater hWndButtonProc; -#endif - -// Keeps the various sources for Update polling (PADpoll, PADupdate, etc) from wreaking -// havoc on each other... -static std::mutex updateLock; -// Used to toggle mouse listening. -u8 miceEnabled; - -// 2 when both pads are initialized, 1 for one pad, etc. -int openCount = 0; - -int activeWindow = 0; -#ifdef _MSC_VER -int windowThreadId = 0; -int updateQueued = 0; -#endif - -u32 bufSize = 0; -unsigned char outBuf[50]; -unsigned char inBuf[50]; - -// windowThreadId = GetWindowThreadProcessId(hWnd, 0); - -#define MODE_PS1_MOUSE 0x12 -#define MODE_NEGCON 0x23 -#define MODE_DIGITAL 0x41 -#define MODE_ANALOG 0x73 -#define MODE_DS2_NATIVE 0x79 - -void DEBUG_TEXT_OUT(const char* text) -{ - if (!config.debug) - return; - - std::ofstream file("logs/padLog.txt", std::ios::app); - if (!file.good()) - return; - file << text; -} - -void DEBUG_NEW_SET() -{ - if (config.debug && bufSize > 1) - { - std::ofstream file("logs/padLog.txt", std::ios::app); - if (file.good()) - { - std::stringstream stream; - stream.setf(std::ios::hex, std::ios::basefield); - stream.setf(std::ios::uppercase); - stream.fill('0'); - - unsigned char* buffer[2] = {inBuf, outBuf}; - for (const auto& buf : buffer) - { - // Port/FF - stream << std::setw(2) << int(buf[0]); - // Active slots/Enabled (only relevant for multitap) - stream << " (" << std::setw(2) << int(buf[1]) << ')'; - - // Command/Response - for (u32 n = 2; n < bufSize; ++n) - stream << ' ' << std::setw(2) << int(buf[n]); - stream << '\n'; - } - stream << '\n'; - file << stream.rdbuf(); - } - } - bufSize = 0; -} - -inline void DEBUG_IN(unsigned char c) -{ - if (bufSize < sizeof(inBuf)) - inBuf[bufSize] = c; -} -inline void DEBUG_OUT(unsigned char c) -{ - if (bufSize < sizeof(outBuf)) - outBuf[bufSize++] = c; -} - -struct Stick -{ - int horiz; - int vert; -}; - -// Sum of states of all controls for a pad (Not including toggles). -struct ButtonSum -{ - int buttons[16]; - Stick sticks[2]; -}; - -#define PAD_SAVE_STATE_VERSION 5 - -// Freeze data, for a single pad. Basically has all pad state that -// a PS2 can set. -struct PadFreezeData -{ - // Digital / Analog / DS2 Native - u8 mode; - - u8 previousType; - - u8 modeLock; - - // In config mode - u8 config; - - u8 vibrate[8]; - u8 umask[3]; - - // Vibration indices. - u8 vibrateI[2]; - - // Last vibration value sent to controller. - // Only used so as not to call vibration - // functions when old and new values are both 0. - u8 currentVibrate[2]; - - // Next vibrate val to send to controller. If next and current are - // both 0, nothing is sent to the controller. Otherwise, it's sent - // on every update. - u8 nextVibrate[2]; -}; - -class Pad : public PadFreezeData -{ -public: - // Current pad state. - ButtonSum sum; - // State of locked buttons. Already included by sum, used - // as initial value of sum. - ButtonSum lockedSum; - - // Flags for which controls (buttons or axes) are locked, if any. - DWORD lockedState; - - // Used to keep track of which pads I'm running. - // Note that initialized pads *can* be disabled. - // I keep track of state of non-disabled non-initialized - // pads, but should never be asked for their state. - u8 initialized; - - // Set to 1 if the state of this pad has been updated since its state - // was last queried. - char stateUpdated; - - // initialized and not disabled (and mtap state for slots > 0). - u8 enabled; -} pads[2][4]; - -// Active slots for each port. -int slots[2]; -// Which ports we're running on. -int portInitialized[2]; - -// Force value to be from 0 to 255. -u8 Cap(int i) -{ - if (i < 0) - return 0; - if (i > 255) - return 255; - return (u8)i; -} - -inline void ReleaseModifierKeys() -{ - QueueKeyEvent(VK_SHIFT, HostKeyEvent::Type::KeyReleased); - QueueKeyEvent(VK_MENU, HostKeyEvent::Type::KeyReleased); - QueueKeyEvent(VK_CONTROL, HostKeyEvent::Type::KeyReleased); -} - -// RefreshEnabledDevices() enables everything that can potentially -// be bound to, as well as the "Ignore keyboard" device. -// -// This enables everything that input should be read from while the -// emulator is running. Takes into account mouse and focus state -// and which devices have bindings for enabled pads. Releases -// keyboards if window is not focused. Releases game devices if -// background monitoring is not checked. -// And releases games if not focused and config.background is not set. -void UpdateEnabledDevices(int updateList = 0) -{ - // Enable all devices I might want. Can ignore the rest. - RefreshEnabledDevices(updateList); - // Figure out which pads I'm getting input for. - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - if (slot > 0 && !config.multitap[port]) - { - pads[port][slot].enabled = 0; - } - else - { - pads[port][slot].enabled = pads[port][slot].initialized && config.padConfigs[port][slot].type != DisabledPad; - } - } - } - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - - if (!dev->enabled) - continue; - if (!dev->attached) - { - dm->DisableDevice(i); - continue; - } - - // Disable ignore keyboard if don't have focus or there are no keys to ignore. - if (dev->api == IGNORE_KEYBOARD) - { - if ((config.keyboardApi == NO_API || !dev->pads[0][0][0].numBindings) || !activeWindow) - { - dm->DisableDevice(i); - } - continue; - } - // Keep for PCSX2 keyboard shotcuts, unless unfocused. - if (dev->type == KEYBOARD) - { - if (!activeWindow) - dm->DisableDevice(i); - } - // Keep for cursor hiding consistency, unless unfocused. - // miceEnabled tracks state of mouse enable/disable button, not if mouse API is set to disabled. - else if (dev->type == MOUSE) - { - if (!miceEnabled || !activeWindow) - dm->DisableDevice(i); - } - else if (!activeWindow && !config.background) - dm->DisableDevice(i); - else - { - int numActiveBindings = 0; - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - int padtype = config.padConfigs[port][slot].type; - if (pads[port][slot].enabled) - { - numActiveBindings += dev->pads[port][slot][padtype].numBindings + dev->pads[port][slot][padtype].numFFBindings; - } - } - } - if (!numActiveBindings) - dm->DisableDevice(i); - } - } -} - -void AddForce(ButtonSum* sum, u8 cmd, int delta = 255) -{ - if (!delta) - return; - if (cmd < 0x14) - { - sum->buttons[cmd - 0x10] += delta; - } - // D-pad. Command numbering is based on ordering of digital values. - else if (cmd < 0x18) - { - sum->buttons[cmd - 0x08] += delta; - } - else if (cmd < 0x20) - { - sum->buttons[cmd - 0x10 - 4] += delta; - } - // Left stick. - else if (cmd < 0x24) - { - if (cmd == 0x20) - { // Up - sum->sticks[1].vert -= delta; - } - else if (cmd == 0x21) - { // Right - sum->sticks[1].horiz += delta; - } - else if (cmd == 0x22) - { // Down - sum->sticks[1].vert += delta; - } - else if (cmd == 0x23) - { // Left - sum->sticks[1].horiz -= delta; - } - } - // Right stick. - else if (cmd < 0x28) - { - if (cmd == 0x24) - { // Up - sum->sticks[0].vert -= delta; - } - else if (cmd == 0x25) - { // Right - sum->sticks[0].horiz += delta; - } - else if (cmd == 0x26) - { // Down - sum->sticks[0].vert += delta; - } - else if (cmd == 0x27) - { // Left - sum->sticks[0].horiz -= delta; - } - } -} - -void ProcessButtonBinding(Binding* b, ButtonSum* sum, int value) -{ - if (value < b->deadZone || value == 0) - { - return; - } - if (b->skipDeadZone > b->deadZone) - { - value = std::min((int)(((__int64)value * (FULLY_DOWN - (__int64)b->skipDeadZone)) / FULLY_DOWN) + b->skipDeadZone, FULLY_DOWN); - } - - if (b->command == 0x2D) - { // Turbo key - static unsigned int LastCheck = 0; - unsigned int t = timeGetTime(); - if (t - LastCheck < 300) - return; - QueueKeyEvent(VK_TAB, HostKeyEvent::Type::KeyPressed); - LastCheck = t; - } - - int sensitivity = b->sensitivity; - if (sensitivity < 0) - { - sensitivity = -sensitivity; - value = (1 << 16) - value; - } - if (value < 0) - return; - - /* Note: Value ranges of FULLY_DOWN, and sensitivity of - * BASE_SENSITIVITY corresponds to an axis/button being exactly fully down. - * Math in next line takes care of those two conditions, rounding as necessary. - * Done using __int64s because overflows will occur when - * sensitivity > BASE_SENSITIVITY and/or value > FULLY_DOWN. Latter only happens - * for relative axis. - */ - int force = (int)((((sensitivity * (255 * (__int64)value)) + BASE_SENSITIVITY / 2) / BASE_SENSITIVITY + FULLY_DOWN / 2) / FULLY_DOWN); - AddForce(sum, b->command, force); -} - -// Restricts d-pad/analog stick values to be from -255 to 255 and button values to be from 0 to 255. -// With D-pad in DS2 native mode, the negative and positive ranges are both independently from 0 to 255, -// which is why I use 9 bits of all sticks. For left and right sticks, I have to remove a bit before sending. -void CapSum(ButtonSum* sum) -{ - int i; - for (i = 0; i < 2; i++) - { - int div = std::max(abs(sum->sticks[i].horiz), abs(sum->sticks[i].vert)); - if (div > 255) - { - sum->sticks[i].horiz = sum->sticks[i].horiz * 255 / div; - sum->sticks[i].vert = sum->sticks[i].vert * 255 / div; - } - } - for (i = 0; i < 16; i++) - { - sum->buttons[i] = Cap(sum->buttons[i]); - } -} - -// Counter similar to stateUpdated for each pad, except used for PADkeyEvent instead. -// Only matters when GS thread updates is disabled (Just like summed pad values -// for pads beyond the first slot). - -// Values, in order, correspond to PADkeyEvent, PADupdate(0), PADupdate(1), and -// WndProc(WMA_FORCE_UPDATE). Last is always 0. -char padReadKeyUpdated[4] = {0, 0, 0, 0}; - -#define LOCK_DIRECTION 2 -#define LOCK_BUTTONS 4 -#define LOCK_BOTH 1 - -void Update(unsigned int port, unsigned int slot) -{ - char* stateUpdated; - if (port < 2) - { - stateUpdated = &pads[port][slot].stateUpdated; - } - else if (port < 6) - { - stateUpdated = padReadKeyUpdated + port - 2; - } - else - return; - - if (*stateUpdated > 0) - { - stateUpdated[0]--; - return; - } - -// Lock prior to timecheck code to avoid pesky race conditions. - std::lock_guard lock(updateLock); - - static unsigned int LastCheck = 0; - unsigned int t = timeGetTime(); - if (t - LastCheck < 15 || !openCount) - return; - -#ifdef _MSC_VER - if (windowThreadId != GetCurrentThreadId()) - { - if (stateUpdated[0] < 0) - { - if (!updateQueued) - { - updateQueued = 1; - PostMessage(static_cast(s_window_info.window_handle), - WMA_FORCE_UPDATE, FORCE_UPDATE_WPARAM, FORCE_UPDATE_LPARAM); - } - } - else - { - stateUpdated[0]--; - } - return; - } -#endif - - LastCheck = t; - - int i; - ButtonSum s[2][4]; - u8 lockStateChanged[2][4]; - memset(lockStateChanged, 0, sizeof(lockStateChanged)); - - for (i = 0; i < 8; i++) - { - s[i & 1][i >> 1] = pads[i & 1][i >> 1].lockedSum; - } -#ifdef __linux__ - InitInfo info = { - 0, 0, GSdsp, GSwin}; -#else - InitInfo info = { - 0, 0, hWndTop, &hWndGSProc}; -#endif - dm->Update(&info); - static int rapidFire = 0; - rapidFire++; - static bool anyDeviceActiveAndBound = true; - bool currentDeviceActiveAndBound = false; - for (i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - // Skip both disabled devices and inactive enabled devices. - // Shouldn't be any of the latter, in general, but just in case... - if (!dev->active) - continue; - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - int padtype = config.padConfigs[port][slot].type; - if (padtype == DisabledPad || !pads[port][slot].initialized) - continue; - for (int j = 0; j < dev->pads[port][slot][padtype].numBindings; j++) - { - Binding* b = dev->pads[port][slot][padtype].bindings + j; - int cmd = b->command; - int state = dev->virtualControlState[b->controlIndex]; - if (!(rapidFire & b->rapidFire)) - { - if ((cmd > 0x0F && cmd < 0x2A && cmd != 0x28) || cmd > 0x2C) - { - ProcessButtonBinding(b, &s[port][slot], state); - } - else if ((state >> 15) && !(dev->oldVirtualControlState[b->controlIndex] >> 15)) - { - if (cmd == 0x0F) - { // Mouse - miceEnabled = !miceEnabled; - UpdateEnabledDevices(); - } - else if (cmd == 0x2A) - { // Lock Buttons - lockStateChanged[port][slot] |= LOCK_BUTTONS; - } - else if (cmd == 0x2B) - { // Lock Input - lockStateChanged[port][slot] |= LOCK_BOTH; - } - else if (cmd == 0x2C) - { // Lock Direction - lockStateChanged[port][slot] |= LOCK_DIRECTION; - } - else if (cmd == 0x28 && !pads[port][slot].modeLock && padtype == Dualshock2Pad) - { // Analog - if (pads[port][slot].mode == MODE_ANALOG) - pads[port][slot].mode = MODE_DIGITAL; - else if (pads[port][slot].mode == MODE_DIGITAL) - pads[port][slot].mode = MODE_ANALOG; - } - } - } - } - } - } - if (dev->attached && dev->pads[0][0][config.padConfigs[0][0].type].numBindings > 0) - { - if (!anyDeviceActiveAndBound) - { - anyDeviceActiveAndBound = true; - } - currentDeviceActiveAndBound = true; - } - } - if (!currentDeviceActiveAndBound && activeWindow) - { - if (anyDeviceActiveAndBound) - Console.Warning("PAD: Warning! No controls are bound to a currently attached device!\nPlease attach a controller that has been setup for use with PAD or go to GamePad Settings and setup new controls.\n"); - anyDeviceActiveAndBound = false; - } - dm->PostRead(); - - { - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - for (int motor = 0; motor < 2; motor++) - { - // TODO: Probably be better to send all of these at once. - if (pads[port][slot].nextVibrate[motor] | pads[port][slot].currentVibrate[motor]) - { - pads[port][slot].currentVibrate[motor] = pads[port][slot].nextVibrate[motor]; - dm->SetEffect(port, slot, motor, pads[port][slot].nextVibrate[motor]); - } - } - } - } - - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - pads[port][slot].stateUpdated = 1; - if (config.padConfigs[port][slot].type == DisabledPad || !pads[port][slot].initialized) - continue; - if (config.padConfigs[port][slot].type == GuitarPad) - { - if (!config.GH2) - { - s[port][slot].sticks[0].vert = -s[port][slot].sticks[0].vert; - } - else // GH2 hack. - { - const unsigned int oldIdList[5] = {ID_R2, ID_CIRCLE, ID_TRIANGLE, ID_CROSS, ID_SQUARE}; - const unsigned int idList[5] = {ID_L2, ID_L1, ID_R1, ID_R2, ID_CROSS}; - int values[5]; - int i; - for (i = 0; i < 5; i++) - { - int id = oldIdList[i] - ID_DPAD_UP; - values[i] = s[port][slot].buttons[id]; - s[port][slot].buttons[id] = 0; - } - s[port][slot].buttons[ID_TRIANGLE - ID_DPAD_UP] = values[1]; - for (i = 0; i < 5; i++) - { - int id = idList[i] - ID_DPAD_UP; - s[port][slot].buttons[id] = values[i]; - } - if (s[port][slot].buttons[14] <= 48 && s[port][slot].buttons[12] <= 48) - { - for (int i = 0; i < 5; i++) - { - unsigned int id = idList[i] - ID_DPAD_UP; - if (pads[port][slot].sum.buttons[id] < s[port][slot].buttons[id]) - { - s[port][slot].buttons[id] = pads[port][slot].sum.buttons[id]; - } - } - } - else if (pads[port][slot].sum.buttons[14] <= 48 && pads[port][slot].sum.buttons[12] <= 48) - { - for (int i = 0; i < 5; i++) - { - unsigned int id = idList[i] - ID_DPAD_UP; - if (pads[port][slot].sum.buttons[id]) - { - s[port][slot].buttons[id] = 0; - } - } - } - } - } - - if (pads[port][slot].mode == MODE_DIGITAL) - { - for (int i = 0; i <= 1; i++) - { - if (s[port][slot].sticks[i].horiz >= 100) - s[port][slot].buttons[13] += s[port][slot].sticks[i].horiz; - if (s[port][slot].sticks[i].horiz <= -100) - s[port][slot].buttons[15] -= s[port][slot].sticks[i].horiz; - if (s[port][slot].sticks[i].vert >= 100) - s[port][slot].buttons[14] += s[port][slot].sticks[i].vert; - if (s[port][slot].sticks[i].vert <= -100) - s[port][slot].buttons[12] -= s[port][slot].sticks[i].vert; - } - } - - CapSum(&s[port][slot]); - if (lockStateChanged[port][slot]) - { - if (lockStateChanged[port][slot] & LOCK_BOTH) - { - if (pads[port][slot].lockedState != (LOCK_DIRECTION | LOCK_BUTTONS)) - { - // Enable the one that's not enabled. - lockStateChanged[port][slot] ^= pads[port][slot].lockedState ^ (LOCK_DIRECTION | LOCK_BUTTONS); - } - else - { - // Disable both - lockStateChanged[port][slot] ^= LOCK_DIRECTION | LOCK_BUTTONS; - } - } - if (lockStateChanged[port][slot] & LOCK_DIRECTION) - { - if (pads[port][slot].lockedState & LOCK_DIRECTION) - { - memset(pads[port][slot].lockedSum.sticks, 0, sizeof(pads[port][slot].lockedSum.sticks)); - } - else - { - memcpy(pads[port][slot].lockedSum.sticks, s[port][slot].sticks, sizeof(pads[port][slot].lockedSum.sticks)); - } - pads[port][slot].lockedState ^= LOCK_DIRECTION; - } - if (lockStateChanged[port][slot] & LOCK_BUTTONS) - { - if (pads[port][slot].lockedState & LOCK_BUTTONS) - { - memset(pads[port][slot].lockedSum.buttons, 0, sizeof(pads[port][slot].lockedSum.buttons)); - } - else - { - memcpy(pads[port][slot].lockedSum.buttons, s[port][slot].buttons, sizeof(pads[port][slot].lockedSum.buttons)); - } - pads[port][slot].lockedState ^= LOCK_BUTTONS; - } - for (i = 0; i < (int)sizeof(pads[port][slot].lockedSum) / 4; i++) - { - if (((int*)&pads[port][slot].lockedSum)[i]) - break; - } - if (i == sizeof(pads[port][slot].lockedSum) / 4) - { - pads[port][slot].lockedState = 0; - } - } - } - } - } - for (i = 0; i < 8; i++) - { - pads[i & 1][i >> 1].sum = s[i & 1][i >> 1]; - } - - padReadKeyUpdated[0] = padReadKeyUpdated[1] = padReadKeyUpdated[2] = 1; - - if (stateUpdated[0] > 0) - --stateUpdated[0]; -} - -void PADupdate(int port) -{ - Update(port + 3, 0); -} - -inline void SetVibrate(int port, int slot, int motor, u8 val) -{ - pads[port][slot].nextVibrate[motor] = val; -} - -#ifdef _MSC_VER -// Used in about and config screens. -void GetNameAndVersionString(wchar_t* out) -{ - wsprintfW(out, L"GamePad"); -} -#endif - - -void PADshutdown() -{ - for (int i = 0; i < 8; i++) - pads[i & 1][i >> 1].initialized = 0; - portInitialized[0] = portInitialized[1] = 0; - UnloadConfigs(); -} - -inline void StopVibrate() -{ - for (int i = 0; i < 8; i++) - { - SetVibrate(i & 1, i >> 1, 0, 0); - SetVibrate(i & 1, i >> 1, 1, 0); - } -} - -inline void ResetVibrate(int port, int slot) -{ - SetVibrate(port, slot, 0, 0); - SetVibrate(port, slot, 1, 0); - pads[port][slot].vibrate[0] = 0x5A; - for (int i = 1; i < 8; ++i) - pads[port][slot].vibrate[i] = 0xFF; -} - -void ResetPad(int port, int slot) -{ - // Lines before memset currently don't do anything useful, - // but allow this function to be called at any time. - - // Need to backup, so can be called at any point. - u8 enabled = pads[port][slot].enabled; - - // Currently should never do anything. - SetVibrate(port, slot, 0, 0); - SetVibrate(port, slot, 1, 0); - - memset(&pads[port][slot], 0, sizeof(pads[0][0])); - if (config.padConfigs[port][slot].type == MousePad) - pads[port][slot].mode = MODE_PS1_MOUSE; - else if (config.padConfigs[port][slot].type == neGconPad) - pads[port][slot].mode = MODE_NEGCON; - else - pads[port][slot].mode = MODE_DIGITAL; - - pads[port][slot].umask[0] = 0xFF; - pads[port][slot].umask[1] = 0xFF; - pads[port][slot].umask[2] = 0x03; - // Sets up vibrate variable. - ResetVibrate(port, slot); - pads[port][slot].initialized = 1; - - pads[port][slot].enabled = enabled; - - pads[port][slot].previousType = config.padConfigs[port][slot].type; - - pads[port][slot].config = 0; -} - - -struct QueryInfo -{ - u8 port; - u8 slot; - u8 lastByte; - u8 currentCommand; - u8 numBytes; - u8 queryDone; - u8 response[42]; -} query = {0, 0, 0, 0, 0, 0xFF, {0xF3}}; - -s32 PADinit() -{ - // Note: Won't load settings if already loaded. - if (LoadSettings() < 0) - { - return -1; - } - - for (int i = 2; i > 0; i--) - { - int port = i; - port--; - - for (int slot = 0; slot < 4; slot++) - ResetPad(port, slot); - slots[port] = 0; - portInitialized[port] = 1; - - query.lastByte = 1; - query.numBytes = 0; - ClearKeyQueue(); -#ifdef __linux__ - R_ClearKeyQueue(); -#endif - // Just in case, when resuming emulation. - ReleaseModifierKeys(); - } - - return 0; -} - - - -// Note to self: Has to be a define for the sizeof() to work right. -// Note to self 2: All are the same size, anyways, except for longer full DS2 response -// and shorter digital mode response. -#define SET_RESULT(a) \ - { \ - memcpy(query.response + 2, a, sizeof(a)); \ - query.numBytes = 2 + sizeof(a); \ - } - -#define SET_FINAL_RESULT(a) \ - { \ - memcpy(query.response + 2, a, sizeof(a)); \ - query.numBytes = 2 + sizeof(a); \ - query.queryDone = 1; \ - } - -static const u8 ConfigExit[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -//static const u8 ConfigExit[7] = {0x5A, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00}; - -static const u8 noclue[7] = {0x5A, 0x00, 0x00, 0x02, 0x00, 0x00, 0x5A}; -static u8 queryMaskMode[7] = {0x5A, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x5A}; -//static const u8 DSNonNativeMode[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const u8 setMode[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - -// DS2 -static const u8 queryModelDS2[7] = {0x5A, 0x03, 0x02, 0x00, 0x02, 0x01, 0x00}; -// DS1 -static const u8 queryModelDS1[7] = {0x5A, 0x01, 0x02, 0x00, 0x02, 0x01, 0x00}; - -static const u8 queryAct[2][7] = {{0x5A, 0x00, 0x00, 0x01, 0x02, 0x00, 0x0A}, - {0x5A, 0x00, 0x00, 0x01, 0x01, 0x01, 0x14}}; - -static const u8 queryComb[7] = {0x5A, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00}; - -static const u8 queryMode[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - - -static const u8 setNativeMode[7] = {0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A}; - -#ifdef _MSC_VER -// Useful sequence before changing into active/inactive state. -// Handles hooking/unhooking of mouse and KB and also mouse cursor visibility. -// towardsActive==true indicates we're gaining activity (on focus etc), false is for losing activity (on close, kill focus, etc). -void PrepareActivityState(bool towardsActive) -{ - if (!towardsActive) - ReleaseModifierKeys(); - activeWindow = towardsActive; - UpdateEnabledDevices(); -} - -// responsible for monitoring device addition/removal, focus changes, and viewport closures. -ExtraWndProcResult StatusWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* output) -{ - switch (uMsg) - { - case WMA_FORCE_UPDATE: - if (wParam == FORCE_UPDATE_WPARAM && lParam == FORCE_UPDATE_LPARAM) - { - if (updateQueued) - { - updateQueued = 0; - Update(5, 0); - } - return NO_WND_PROC; - } - case WM_DEVICECHANGE: - if (wParam == DBT_DEVNODES_CHANGED) - { - UpdateEnabledDevices(1); - } - break; - case WM_ACTIVATE: - // Release any buttons PCSX2 may think are down when - // losing/gaining focus. - // Note - I never managed to see this case entered, but SET/KILLFOCUS are entered. - avih 2014-04-16 - PrepareActivityState(LOWORD(wParam) != WA_INACTIVE); - break; - case WM_DESTROY: - QueueKeyEvent(VK_ESCAPE, HostKeyEvent::Type::KeyPressed); - break; - case WM_KILLFOCUS: - PrepareActivityState(false); - break; - case WM_SETFOCUS: - PrepareActivityState(true); - break; - default: - break; - } - return CONTINUE_BLISSFULLY; -} -#endif - -#ifndef PCSX2_CORE -void PADconfigure() -{ - ScopedCoreThreadPause paused_core(SystemsMask::System_PAD); - Configure(); - paused_core.AllowResume(); -} -#endif - -s32 PADopen(const WindowInfo& wi) -{ - if (openCount++) - return 0; - - miceEnabled = !config.mouseUnfocus; -#ifdef _MSC_VER - if (wi.type != WindowInfo::Type::Win32) - { - openCount = 0; - MessageBoxA(GetActiveWindow(), - "Invalid Window handle passed to PAD.\n" - "\n" - "Either your emulator or gs plugin is buggy,\n" - "Despite the fact the emulator is about to\n" - "blame PAD for failing to initialize.", - "Non-PAD Error", MB_OK | MB_ICONERROR); - return -1; - } - - const HWND hWnd = static_cast(wi.window_handle); - hWndTop = GetAncestor(hWnd, GA_ROOT); - - if (!hWndGSProc.SetWndHandle(hWnd)) - { - openCount = 0; - return -1; - } - - // Implements most hacks, as well as enabling/disabling mouse - // capture when focus changes. - updateQueued = 0; - hWndGSProc.Eat(StatusWndProc, 0); - - windowThreadId = GetWindowThreadProcessId(hWndTop, 0); - s_window_info = wi; - -#endif - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - memset(&pads[port][slot].sum, 0, sizeof(pads[port][slot].sum)); - memset(&pads[port][slot].lockedSum, 0, sizeof(pads[port][slot].lockedSum)); - pads[port][slot].lockedState = 0; - - if (config.padConfigs[port][slot].type != pads[port][slot].previousType) - { - ResetPad(port, slot); - } - } - } - -#ifdef _MSC_VER -// I'd really rather use this line, but GetActiveWindow() does not have complete specs. -// It *seems* to return null when no window from this thread has focus, but the -// Microsoft specs seem to imply it returns the window from this thread that would have focus, -// if any window did (topmost in this thread?). Which isn't what I want, and doesn't seem -// to be what it actually does. -// activeWindow = GetActiveWindow() == hWnd; - -// activeWindow = (GetAncestor(hWnd, GA_ROOT) == GetAncestor(GetForegroundWindow(), GA_ROOT)); -#endif - activeWindow = 1; - UpdateEnabledDevices(); - return 0; -} - -void PADclose() -{ - if (openCount && !--openCount) - { -#ifdef _MSC_VER - updateQueued = 0; - hWndGSProc.Release(); - hWndTopProc.Release(); - dm->ReleaseInput(); - s_window_info = WindowInfo(); -#else - R_ClearKeyQueue(); -#endif - ClearKeyQueue(); - } -} - -bool PADcomplete() -{ - return query.queryDone; -} - -u8 PADstartPoll(int port, int slot) -{ - DEBUG_NEW_SET(); - - if ((unsigned int)port <= 1 && pads[port][slot].enabled) - { - query.queryDone = 0; - query.port = port; - query.slot = slot; - query.numBytes = 2; - query.lastByte = 0; - DEBUG_IN(port); - DEBUG_OUT(0xFF); - DEBUG_IN(slot); - DEBUG_OUT(pads[port][slot].enabled); - return 0xFF; - } - else - { - query.queryDone = 1; - query.numBytes = 0; - query.lastByte = 1; - DEBUG_IN(0); - DEBUG_OUT(0); - DEBUG_IN(port); - DEBUG_OUT(0); - return 0; - } -} - -inline int IsDualshock2(u8 port, u8 slot) -{ - return config.padConfigs[query.port][query.slot].type == Dualshock2Pad || - (config.padConfigs[query.port][query.slot].type == GuitarPad && config.GH2); -} - -u8 PADpoll(u8 value) -{ - DEBUG_IN(value); - if (query.lastByte + 1 >= query.numBytes) - { - DEBUG_OUT(0); - return 0; - } - if (query.lastByte && query.queryDone) - { - DEBUG_OUT(query.response[1 + query.lastByte]); - return query.response[++query.lastByte]; - } - - Pad* pad = &pads[query.port][query.slot]; - int padtype = config.padConfigs[query.port][query.slot].type; - - if (query.lastByte == 0) - { - query.lastByte++; - query.currentCommand = value; - - // Only the 0x42(read input and vibration) and 0x43(enter or exit config mode) command cases work outside of config mode, the other cases will be avoided. - if ((!pad->config && value != 0x42 && value != 0x43) || (padtype == neGconPad && (value < 0x40 || value > 0x45))) - { - query.numBytes = 0; - query.queryDone = 1; - DEBUG_OUT(0xF3); - return 0xF3; - } - switch (value) - { - // CONFIG_MODE - case 0x43: - if (pad->config && padtype != neGconPad) - { - // In config mode. Might not actually be leaving it. - SET_RESULT(ConfigExit); - DEBUG_OUT(0xF3); - return 0xF3; - } - // Fall through - - // READ_DATA_AND_VIBRATE - case 0x42: - query.response[2] = 0x5A; - { - Update(query.port, query.slot); - ButtonSum* sum = &pad->sum; - - if (padtype == MousePad) - { - u8 b1 = 0xFC; - if (sum->buttons[9] > 0) // Left button - b1 -= 8; - if (sum->buttons[10] > 0) // Right button - b1 -= 4; - - query.response[3] = 0xFF; - query.response[4] = b1; - query.response[5] = sum->sticks[1].horiz / 2; - query.response[6] = sum->sticks[1].vert / 2; - query.numBytes = 7; - query.lastByte = 1; - DEBUG_OUT(MODE_PS1_MOUSE); - return MODE_PS1_MOUSE; - } - if (padtype == neGconPad) - { - u8 b1 = 0xFF, b2 = 0xFF; - b1 -= (sum->buttons[3] > 0) << 3; // Start - - for (int i = 3; i < 6; i++) - { - b2 -= (sum->buttons[i + 4] > 0) << i; // R, A, B - } - for (int i = 4; i < 8; i++) - { - b1 -= (sum->buttons[i + 8] > 0) << i; // D-pad Up, Right, Down, Left - } - - query.response[3] = b1; - query.response[4] = b2; - query.response[5] = Cap((sum->sticks[1].horiz + 255) / 2); // Swivel - query.response[6] = (unsigned char)sum->buttons[10]; // I - query.response[7] = (unsigned char)sum->buttons[11]; // II - query.response[8] = (unsigned char)sum->buttons[6]; // L - - query.numBytes = 9; - query.lastByte = 1; - DEBUG_OUT(MODE_NEGCON); - return MODE_NEGCON; - } - - u8 b1 = 0xFF, b2 = 0xFF; - for (int i = 0; i < 4; i++) - { - b1 -= (sum->buttons[i] > 0) << i; - } - for (int i = 0; i < 8; i++) - { - b2 -= (sum->buttons[i + 4] > 0) << i; - } - - if (padtype == GuitarPad && !config.GH2) - { - sum->buttons[15] = 255; - // Not sure about this. Forces wammy to be from 0 to 0x7F. - // if (sum->sticks[2].vert > 0) sum->sticks[2].vert = 0; - } - - for (int i = 4; i < 8; i++) - { - b1 -= (sum->buttons[i + 8] > 0) << i; - } - - //Left, Right and Down are always pressed on Pop'n Music controller. - if (padtype == PopnPad) - b1 = b1 & 0x1f; - - query.response[3] = b1; - query.response[4] = b2; - - query.numBytes = 5; - if (pad->mode != MODE_DIGITAL) - { - query.response[5] = Cap((sum->sticks[0].horiz + 255) / 2); // Right stick: left & right - query.response[6] = Cap((sum->sticks[0].vert + 255) / 2); // Right stick: up & down - query.response[7] = Cap((sum->sticks[1].horiz + 255) / 2); // Left stick: left & right - query.response[8] = Cap((sum->sticks[1].vert + 255) / 2); // Left stick: up & down - - query.numBytes = 9; - if (pad->mode != MODE_ANALOG && !pad->config) - { - // Good idea? No clue. - //query.response[3] &= pad->mask[0]; - //query.response[4] &= pad->mask[1]; - - // No need to cap these, already done int CapSum(). - query.response[9] = (unsigned char)sum->buttons[13]; // D-pad right - query.response[10] = (unsigned char)sum->buttons[15]; // D-pad left - query.response[11] = (unsigned char)sum->buttons[12]; // D-pad up - query.response[12] = (unsigned char)sum->buttons[14]; // D-pad down - - query.response[13] = (unsigned char)sum->buttons[8]; // Triangle - query.response[14] = (unsigned char)sum->buttons[9]; // Circle - query.response[15] = (unsigned char)sum->buttons[10]; // Cross - query.response[16] = (unsigned char)sum->buttons[11]; // Square - - query.response[17] = (unsigned char)sum->buttons[6]; // L1 - query.response[18] = (unsigned char)sum->buttons[7]; // R1 - query.response[19] = (unsigned char)sum->buttons[4]; // L2 - query.response[20] = (unsigned char)sum->buttons[5]; // R2 - query.numBytes = 21; - } - } - } - query.lastByte = 1; - DEBUG_OUT(pad->mode); - return pad->mode; - // SET_VREF_PARAM - case 0x40: - SET_FINAL_RESULT(noclue); - break; - // QUERY_DS2_ANALOG_MODE - case 0x41: - // Right? Wrong? No clue. - if (pad->mode == MODE_DIGITAL || pad->mode == MODE_PS1_MOUSE || pad->mode == MODE_NEGCON) - { - queryMaskMode[1] = queryMaskMode[2] = queryMaskMode[3] = 0; - queryMaskMode[6] = 0x00; - } - else - { - queryMaskMode[1] = pad->umask[0]; - queryMaskMode[2] = pad->umask[1]; - queryMaskMode[3] = pad->umask[2]; - // Not entirely sure about this. - //queryMaskMode[3] = 0x01 | (pad->mode == MODE_DS2_NATIVE)*2; - queryMaskMode[6] = 0x5A; - } - SET_FINAL_RESULT(queryMaskMode); - break; - // SET_MODE_AND_LOCK - case 0x44: - SET_RESULT(setMode); - ResetVibrate(query.port, query.slot); - break; - // QUERY_MODEL_AND_MODE - case 0x45: - if (IsDualshock2(query.port, query.slot)) - { - SET_FINAL_RESULT(queryModelDS2); - } - else - { - SET_FINAL_RESULT(queryModelDS1); - } - // Not digital mode. - query.response[5] = (pad->mode & 0xF) != 1; - break; - // QUERY_ACT - case 0x46: - SET_RESULT(queryAct[0]); - break; - // QUERY_COMB - case 0x47: - SET_FINAL_RESULT(queryComb); - break; - // QUERY_MODE - case 0x4C: - SET_RESULT(queryMode); - break; - // VIBRATION_TOGGLE - case 0x4D: - memcpy(query.response + 2, pad->vibrate, 7); - query.numBytes = 9; - ResetVibrate(query.port, query.slot); - break; - // SET_DS2_NATIVE_MODE - case 0x4F: - if (IsDualshock2(query.port, query.slot)) - { - SET_RESULT(setNativeMode); - } - else - { - SET_FINAL_RESULT(setNativeMode); - } - break; - default: - query.numBytes = 0; - query.queryDone = 1; - break; - } - DEBUG_OUT(0xF3); - return 0xF3; - } - else - { - query.lastByte++; - - // Only the 0x42(read input and vibration) and 0x43(enter or exit config mode) command cases work outside of config mode, the other cases will be avoided. - if ((!pad->config && query.currentCommand != 0x42 && query.currentCommand != 0x43) || (padtype == neGconPad && (query.currentCommand < 0x40 || query.currentCommand > 0x45))) - { - DEBUG_OUT(query.response[query.lastByte]); - return query.response[query.lastByte]; - } - switch (query.currentCommand) - { - // READ_DATA_AND_VIBRATE - case 0x42: - if (query.lastByte == pad->vibrateI[0]) - { - SetVibrate(query.port, query.slot, 1, 255 * (value & 1)); - } - else if (query.lastByte == pad->vibrateI[1]) - { - SetVibrate(query.port, query.slot, 0, value); - } - break; - // CONFIG_MODE - case 0x43: - if (query.lastByte == 3) - { - query.queryDone = 1; - pad->config = value; - } - break; - // SET_MODE_AND_LOCK - case 0x44: - if (query.lastByte == 3 && value < 2) - { - if (padtype == MousePad) - { - pad->mode = MODE_PS1_MOUSE; - } - else if (padtype == neGconPad) - { - pad->mode = MODE_NEGCON; - } - else - { - static const u8 modes[2] = {MODE_DIGITAL, MODE_ANALOG}; - pad->mode = modes[value]; - } - } - else if (query.lastByte == 4) - { - if (value == 3) - { - pad->modeLock = 3; - } - else - { - pad->modeLock = 0; - } - query.queryDone = 1; - } - break; - // QUERY_ACT - case 0x46: - if (query.lastByte == 3) - { - if (value < 2) - SET_RESULT(queryAct[value]) - // bunch of 0's - // else SET_RESULT(setMode); - query.queryDone = 1; - } - break; - // QUERY_MODE - case 0x4C: - if (query.lastByte == 3 && value < 2) - { - query.response[6] = 4 + value * 3; - query.queryDone = 1; - } - // bunch of 0's - //else data = setMode; - break; - // VIBRATION_TOGGLE - case 0x4D: - if (query.lastByte >= 3) - { - if (value == 0) - { - pad->vibrateI[0] = (u8)query.lastByte; - } - else if (value == 1) - { - pad->vibrateI[1] = (u8)query.lastByte; - } - pad->vibrate[query.lastByte - 2] = value; - } - break; - // SET_DS2_NATIVE_MODE - case 0x4F: - if (query.lastByte >2 && query.lastByte < 6) - { - pad->umask[query.lastByte - 3] = value; - } - pad->mode = MODE_DS2_NATIVE; - break; - default: - DEBUG_OUT(0); - return 0; - } - DEBUG_OUT(query.response[query.lastByte]); - return query.response[query.lastByte]; - } -} - -HostKeyEvent* PADkeyEvent() -{ - // If running both pads, ignore every other call. So if two keys pressed in same interval... - static char eventCount = 0; - eventCount++; - if (eventCount < openCount) - { - return 0; - } - eventCount = 0; - - Update(2, 0); - static HostKeyEvent ev; - if (!GetQueuedKeyEvent(&ev)) - return 0; - -#ifdef _MSC_VER - static char shiftDown = 0; - static char altDown = 0; - if (!activeWindow) - altDown = shiftDown = 0; - - if (miceEnabled && (ev.key == VK_ESCAPE || (int)ev.key == -2) && ev.type == HostKeyEvent::Type::KeyPressed) - { - // Disable mouse/KB hooks on escape (before going into paused mode). - // This is a hack, since PADclose (which is called on pause) should enevtually also deactivate the - // mouse/kb capture. In practice, WindowsMessagingMouse::Deactivate is called from PADclose, but doesn't - // manage to release the mouse, maybe due to the thread from which it's called or some - // state or somehow being too late. - // This explicitly triggers inactivity (releasing mouse/kb hooks) before PCSX2 starts to close subcomponents. - // Regardless, the mouse/kb hooks will get re-enabled on resume if required without need for further hacks. - - PrepareActivityState(false); - } - - // So don't change skip mode on alt-F4. - if (ev.key == VK_F4 && altDown) - { - return 0; - } - - if (ev.key == VK_LSHIFT || ev.key == VK_RSHIFT || ev.key == VK_SHIFT) - { - ev.key = VK_SHIFT; - shiftDown = (ev.type == HostKeyEvent::Type::KeyReleased); - } - else if (ev.key == VK_LCONTROL || ev.key == VK_RCONTROL) - { - ev.key = VK_CONTROL; - } - else if (ev.key == VK_LMENU || ev.key == VK_RMENU || ev.key == VK_SHIFT) - { - ev.key = VK_MENU; - altDown = (ev.type == HostKeyEvent::Type::KeyPressed); - } -#endif - return &ev; -} - -struct PadFullFreezeData -{ - char format[8]; - // Currently all different versions are incompatible. - // May split into major/minor with some compatibility rules. - u32 version; - u8 port; - // active slot for port - u8 slot[2]; - PadFreezeData padData[2][4]; - QueryInfo query; -}; - -s32 PADfreeze(FreezeAction mode, freezeData* data) -{ - if (!data) - { - Console.Warning("PAD savestate null pointer!\n"); - return -1; - } - - if (mode == FreezeAction::Size) - { - data->size = sizeof(PadFullFreezeData); - } - else if (mode == FreezeAction::Load) - { - PadFullFreezeData& pdata = *(PadFullFreezeData*)(data->data); - StopVibrate(); - if (data->size != sizeof(PadFullFreezeData) || - pdata.version != PAD_SAVE_STATE_VERSION || - strcmp(pdata.format, "PadMode")) - return 0; - - if (pdata.port >= 2) - return 0; - - query = pdata.query; - if (pdata.query.slot < 4) - { - query = pdata.query; - } - - // Tales of the Abyss - pad fix - // - restore data for both ports - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - u8 mode = pdata.padData[port][slot].mode; - - if (mode != MODE_DIGITAL && mode != MODE_ANALOG && mode != MODE_DS2_NATIVE && mode != MODE_PS1_MOUSE && mode != MODE_NEGCON) - { - break; - } - - // Not sure if the cast is strictly necessary, but feel safest with it there... - *(PadFreezeData*)&pads[port][slot] = pdata.padData[port][slot]; - } - - if (pdata.slot[port] < 4) - slots[port] = pdata.slot[port]; - } - } - else if (mode == FreezeAction::Save) - { - if (data->size != sizeof(PadFullFreezeData)) - return 0; - PadFullFreezeData& pdata = *(PadFullFreezeData*)(data->data); - - - // Tales of the Abyss - pad fix - // - PCSX2 only saves port0 (save #1), then port1 (save #2) - - memset(&pdata, 0, sizeof(pdata)); - strcpy(pdata.format, "PadMode"); - pdata.version = PAD_SAVE_STATE_VERSION; - pdata.port = 0; - pdata.query = query; - - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - pdata.padData[port][slot] = pads[port][slot]; - } - - pdata.slot[port] = slots[port]; - } - } - else - return -1; - return 0; -} - -s32 PADsetSlot(u8 port, u8 slot) -{ - port--; - slot--; - if (port > 1 || slot > 3) - { - return 0; - } - // Even if no pad there, record the slot, as it is the active slot regardless. - slots[port] = slot; - // First slot always allowed. - // return pads[port][slot].enabled | !slot; - return 1; -} diff --git a/pcsx2/PAD/Windows/PAD.rc b/pcsx2/PAD/Windows/PAD.rc deleted file mode 100644 index 26c0d58e43..0000000000 --- a/pcsx2/PAD/Windows/PAD.rc +++ /dev/null @@ -1,577 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource_pad.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include \r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_CONFIG DIALOGEX 0, 0, 424, 283 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE - // Input Bindings: - PUSHBUTTON "Select",ID_SELECT,328,34,34,15 - PUSHBUTTON "Start",ID_START,366,34,34,15 - PUSHBUTTON "Analog",ID_ANALOG,328,51,34,15 - PUSHBUTTON "Mouse",ID_MOUSE,366,51,34,15 - GROUPBOX "Shoulder buttons",IDC_SHOULDER,196,24,108,46 - PUSHBUTTON "L1",ID_L1,210,34,34,15 - PUSHBUTTON "R1",ID_R1,254,34,34,15 - PUSHBUTTON "L2",ID_L2,210,51,34,15 - PUSHBUTTON "R2",ID_R2,254,51,34,15 - GROUPBOX "D-Pad",IDC_DPAD,196,70,108,70 - PUSHBUTTON "Up",ID_DPAD_UP,233,81,34,15 - PUSHBUTTON "Left",ID_DPAD_LEFT,214,100,34,15 - PUSHBUTTON "Right",ID_DPAD_RIGHT,252,100,34,15 - PUSHBUTTON "Down",ID_DPAD_DOWN,233,118,34,15 - GROUPBOX "Face buttons",IDC_FACE,310,70,108,70 - PUSHBUTTON "Triangle",ID_TRIANGLE,347,81,34,15 - PUSHBUTTON "Square",ID_SQUARE,328,100,34,15 - PUSHBUTTON "Circle",ID_CIRCLE,366,100,34,15 - PUSHBUTTON "Cross",ID_CROSS,347,119,34,15 - GROUPBOX "Left Analog Stick",IDC_LSTICK,196,141,108,70 - PUSHBUTTON "Up",ID_LSTICK_UP,234,152,30,15 - PUSHBUTTON "Left",ID_LSTICK_LEFT,202,171,30,15 - PUSHBUTTON "L3",ID_L3,234,171,30,15 - PUSHBUTTON "Right",ID_LSTICK_RIGHT,266,171,30,15 - PUSHBUTTON "Down",ID_LSTICK_DOWN,234,191,30,15 - GROUPBOX "Right Analog Stick",IDC_RSTICK,310,141,108,70 - PUSHBUTTON "Up",ID_RSTICK_UP,348,152,30,15 - PUSHBUTTON "Left",ID_RSTICK_LEFT,316,171,30,15 - PUSHBUTTON "R3",ID_R3,348,171,30,15 - PUSHBUTTON "Right",ID_RSTICK_RIGHT,380,171,30,15 - PUSHBUTTON "Down",ID_RSTICK_DOWN,348,191,30,15 - // Force Feedback bindings: - GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 - COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 - PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 - // Input options: - PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 - CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER - CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 - PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 - COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 - // Force Feedback & Input configurations: - PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 - PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 - // Force Feedback configuration: - GROUPBOX "",ID_FF,195,9,222,248 - COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17 - CONTROL "Axis 1",IDC_FF_AXIS1_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,63,91,10 - CONTROL "Flip",IDC_FF_AXIS1_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,63,35,10 - EDITTEXT IDC_FF_AXIS1_SCALE,375,63,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS2,"msctls_trackbar32",WS_TABSTOP,199,79,214,17 - CONTROL "Axis 2",IDC_FF_AXIS2_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,99,91,10 - CONTROL "Flip",IDC_FF_AXIS2_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,99,35,10 - EDITTEXT IDC_FF_AXIS2_SCALE,375,99,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS3,"msctls_trackbar32",WS_TABSTOP,199,115,214,17 - CONTROL "Axis 3",IDC_FF_AXIS3_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,135,91,10 - CONTROL "Flip",IDC_FF_AXIS3_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,135,35,10 - EDITTEXT IDC_FF_AXIS3_SCALE,375,135,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS4,"msctls_trackbar32",WS_TABSTOP,199,151,214,17 - CONTROL "Axis 4",IDC_FF_AXIS4_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,171,91,10 - CONTROL "Flip",IDC_FF_AXIS4_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,171,35,10 - EDITTEXT IDC_FF_AXIS4_SCALE,375,171,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS5,"msctls_trackbar32",WS_TABSTOP,199,187,214,17 - CONTROL "Axis 5",IDC_FF_AXIS5_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,207,91,10 - CONTROL "Flip",IDC_FF_AXIS5_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,207,35,10 - EDITTEXT IDC_FF_AXIS5_SCALE,375,207,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS6,"msctls_trackbar32",WS_TABSTOP,199,223,214,17 - CONTROL "Axis 6",IDC_FF_AXIS6_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,243,91,10 - CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10 - EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - PUSHBUTTON "Test",ID_TEST,335,260,59,15 - // Input configuration: - GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 - EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP - EDITTEXT IDC_AXIS_CONTROL,349,22,65,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - CONTROL "Flip",IDC_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,37,27,10 - CONTROL "Rapid Fire",IDC_RAPID_FIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,37,44,10 - LTEXT "Sensitivity",IDC_LABEL_SENSITIVITY,202,51,42,8 - CONTROL "",IDC_SLIDER_SENSITIVITY,"msctls_trackbar32",WS_TABSTOP,240,51,131,17 - EDITTEXT IDC_AXIS_SENSITIVITY,372,53,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Dead Zone",IDC_LABEL_DEADZONE,202,71,42,8 - CONTROL "",IDC_SLIDER_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,71,131,17 - EDITTEXT IDC_AXIS_DEADZONE,372,73,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Skip Dead Zone",IDC_LABEL_SKIP_DEADZONE,202,92,42,16 - CONTROL "",IDC_SLIDER_SKIP_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,92,131,17 - EDITTEXT IDC_AXIS_SKIP_DEADZONE,372,94,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Off",IDC_SKIP_DEADZONE_OFF,390,94,20,12 -END - -IDD_CONFIG_POPN DIALOGEX 0, 0, 424, 283 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE - // Input Bindings: - PUSHBUTTON "Select",ID_SELECT,262,25,43,15 - PUSHBUTTON "Start",ID_START,306,25,43,15 - PUSHBUTTON "White L",ID_TRIANGLE,196,69,43,15 - PUSHBUTTON "Yellow L",ID_CIRCLE,218,51,43,15 - PUSHBUTTON "Green L",ID_R1,240,69,43,15 - PUSHBUTTON "Blue L",ID_CROSS,262,51,43,15 - PUSHBUTTON "Red",ID_L1,284,69,43,15 - PUSHBUTTON "Blue R",ID_SQUARE,306,51,43,15 - PUSHBUTTON "Green R",ID_R2,328,69,43,15 - PUSHBUTTON "Yellow R",ID_DPAD_UP,350,51,43,15 - PUSHBUTTON "White R",ID_L2,372,69,43,15 - // Force Feedback bindings: - GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 - COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 - PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 - // Input options: - PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 - CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER - CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 - PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 - COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 - // Force Feedback & Input configurations: - PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 - PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 - // Force Feedback configuration: - GROUPBOX "",ID_FF,195,9,222,248 - COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17 - CONTROL "Axis 1",IDC_FF_AXIS1_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,63,91,10 - CONTROL "Flip",IDC_FF_AXIS1_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,63,35,10 - EDITTEXT IDC_FF_AXIS1_SCALE,375,63,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS2,"msctls_trackbar32",WS_TABSTOP,199,79,214,17 - CONTROL "Axis 2",IDC_FF_AXIS2_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,99,91,10 - CONTROL "Flip",IDC_FF_AXIS2_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,99,35,10 - EDITTEXT IDC_FF_AXIS2_SCALE,375,99,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS3,"msctls_trackbar32",WS_TABSTOP,199,115,214,17 - CONTROL "Axis 3",IDC_FF_AXIS3_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,135,91,10 - CONTROL "Flip",IDC_FF_AXIS3_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,135,35,10 - EDITTEXT IDC_FF_AXIS3_SCALE,375,135,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS4,"msctls_trackbar32",WS_TABSTOP,199,151,214,17 - CONTROL "Axis 4",IDC_FF_AXIS4_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,171,91,10 - CONTROL "Flip",IDC_FF_AXIS4_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,171,35,10 - EDITTEXT IDC_FF_AXIS4_SCALE,375,171,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS5,"msctls_trackbar32",WS_TABSTOP,199,187,214,17 - CONTROL "Axis 5",IDC_FF_AXIS5_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,207,91,10 - CONTROL "Flip",IDC_FF_AXIS5_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,207,35,10 - EDITTEXT IDC_FF_AXIS5_SCALE,375,207,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS6,"msctls_trackbar32",WS_TABSTOP,199,223,214,17 - CONTROL "Axis 6",IDC_FF_AXIS6_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,243,91,10 - CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10 - EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - PUSHBUTTON "Test",ID_TEST,335,260,59,15 - // Input configuration: - GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 - EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP - EDITTEXT IDC_AXIS_CONTROL,349,22,65,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - CONTROL "Flip",IDC_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,37,27,10 - CONTROL "Rapid Fire",IDC_RAPID_FIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,37,44,10 - LTEXT "Sensitivity",IDC_LABEL_SENSITIVITY,202,51,42,8 - CONTROL "",IDC_SLIDER_SENSITIVITY,"msctls_trackbar32",WS_TABSTOP,240,51,131,17 - EDITTEXT IDC_AXIS_SENSITIVITY,372,53,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Dead Zone",IDC_LABEL_DEADZONE,202,71,42,8 - CONTROL "",IDC_SLIDER_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,71,131,17 - EDITTEXT IDC_AXIS_DEADZONE,372,73,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Skip Dead Zone",IDC_LABEL_SKIP_DEADZONE,202,92,42,16 - CONTROL "",IDC_SLIDER_SKIP_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,92,131,17 - EDITTEXT IDC_AXIS_SKIP_DEADZONE,372,94,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Off",IDC_SKIP_DEADZONE_OFF,390,94,20,12 -END - -IDD_CONFIG_GUITAR DIALOGEX 0, 0, 424, 283 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE - // Input Bindings: - PUSHBUTTON "Fret 1",ID_R2,283,30,45,15 - PUSHBUTTON "Fret 2",ID_CIRCLE,283,53,45,15 - PUSHBUTTON "Fret 3",ID_TRIANGLE,283,76,45,15 - PUSHBUTTON "Fret 4",ID_CROSS,283,99,45,15 - PUSHBUTTON "Fret 5",ID_SQUARE,283,122,45,15 - PUSHBUTTON "Start",ID_START,256,145,45,15 - PUSHBUTTON "Select/Tilt",ID_SELECT,307,145,45,15 - PUSHBUTTON "Whammy Bar Up",ID_LSTICK_UP,219,168,69,15 - PUSHBUTTON "Whammy Bar Down",ID_LSTICK_DOWN,219,191,69,15 - PUSHBUTTON "Strum Bar Up",ID_DPAD_UP,336,168,58,15 - PUSHBUTTON "Strum Bar Down",ID_DPAD_DOWN,336,191,58,15 - // Force Feedback bindings: - GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 - COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 - PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 - // Input options: - PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 - CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER - CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 - PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 - COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 - // Force Feedback & Input configurations: - PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 - PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 - // Force Feedback configuration: - GROUPBOX "",ID_FF,195,9,222,248 - COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17 - CONTROL "Axis 1",IDC_FF_AXIS1_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,63,91,10 - CONTROL "Flip",IDC_FF_AXIS1_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,63,35,10 - EDITTEXT IDC_FF_AXIS1_SCALE,375,63,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS2,"msctls_trackbar32",WS_TABSTOP,199,79,214,17 - CONTROL "Axis 2",IDC_FF_AXIS2_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,99,91,10 - CONTROL "Flip",IDC_FF_AXIS2_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,99,35,10 - EDITTEXT IDC_FF_AXIS2_SCALE,375,99,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS3,"msctls_trackbar32",WS_TABSTOP,199,115,214,17 - CONTROL "Axis 3",IDC_FF_AXIS3_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,135,91,10 - CONTROL "Flip",IDC_FF_AXIS3_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,135,35,10 - EDITTEXT IDC_FF_AXIS3_SCALE,375,135,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS4,"msctls_trackbar32",WS_TABSTOP,199,151,214,17 - CONTROL "Axis 4",IDC_FF_AXIS4_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,171,91,10 - CONTROL "Flip",IDC_FF_AXIS4_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,171,35,10 - EDITTEXT IDC_FF_AXIS4_SCALE,375,171,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS5,"msctls_trackbar32",WS_TABSTOP,199,187,214,17 - CONTROL "Axis 5",IDC_FF_AXIS5_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,207,91,10 - CONTROL "Flip",IDC_FF_AXIS5_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,207,35,10 - EDITTEXT IDC_FF_AXIS5_SCALE,375,207,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - CONTROL "",IDC_FF_AXIS6,"msctls_trackbar32",WS_TABSTOP,199,223,214,17 - CONTROL "Axis 6",IDC_FF_AXIS6_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,243,91,10 - CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10 - EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - PUSHBUTTON "Test",ID_TEST,335,260,59,15 - // Input configuration: - GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 - EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP - EDITTEXT IDC_AXIS_CONTROL,349,22,65,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - CONTROL "Flip",IDC_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,37,27,10 - CONTROL "Rapid Fire",IDC_RAPID_FIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,37,44,10 - LTEXT "Sensitivity",IDC_LABEL_SENSITIVITY,202,51,42,8 - CONTROL "",IDC_SLIDER_SENSITIVITY,"msctls_trackbar32",WS_TABSTOP,240,51,131,17 - EDITTEXT IDC_AXIS_SENSITIVITY,372,53,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Dead Zone",IDC_LABEL_DEADZONE,202,71,42,8 - CONTROL "",IDC_SLIDER_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,71,131,17 - EDITTEXT IDC_AXIS_DEADZONE,372,73,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Skip Dead Zone",IDC_LABEL_SKIP_DEADZONE,202,92,42,16 - CONTROL "",IDC_SLIDER_SKIP_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,92,131,17 - EDITTEXT IDC_AXIS_SKIP_DEADZONE,372,94,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Off",IDC_SKIP_DEADZONE_OFF,390,94,20,12 -END - -IDD_CONFIG_PS1_MOUSE DIALOGEX 0, 0, 424, 283 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE - // Input bindings: - PUSHBUTTON "Mouse",ID_MOUSE,379,28,34,15 - GROUPBOX "Mouse buttons",IDC_FACE,242,46,124,34 - PUSHBUTTON "Left-click",ID_CIRCLE,256,57,45,15 - PUSHBUTTON "Right-click",ID_CROSS,307,57,45,15 - GROUPBOX "Mouse Axis",IDC_LSTICK,242,81,124,74 - PUSHBUTTON "X-axis Left",ID_LSTICK_LEFT,256,112,45,15 - PUSHBUTTON "X-axis Right",ID_LSTICK_RIGHT,307,112,45,15 - PUSHBUTTON "Y-axis Up",ID_LSTICK_UP,283,92,45,15 - PUSHBUTTON "Y-axis Down",ID_LSTICK_DOWN,283,132,45,15 - // Force Feedback bindings: - GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 - COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 - PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 - // Input options: - PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 - CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER - CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 - PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 - COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 - // Force Feedback & Input configurations: - PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 - PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 - // Input configuration: - GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 - EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP - EDITTEXT IDC_AXIS_CONTROL,349,22,65,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - CONTROL "Flip",IDC_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,37,27,10 - CONTROL "Rapid Fire",IDC_RAPID_FIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,37,44,10 - LTEXT "Sensitivity",IDC_LABEL_SENSITIVITY,202,51,42,8 - CONTROL "",IDC_SLIDER_SENSITIVITY,"msctls_trackbar32",WS_TABSTOP,240,51,131,17 - EDITTEXT IDC_AXIS_SENSITIVITY,372,53,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Dead Zone",IDC_LABEL_DEADZONE,202,71,42,8 - CONTROL "",IDC_SLIDER_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,71,131,17 - EDITTEXT IDC_AXIS_DEADZONE,372,73,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Skip Dead Zone",IDC_LABEL_SKIP_DEADZONE,202,92,42,16 - CONTROL "",IDC_SLIDER_SKIP_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,92,131,17 - EDITTEXT IDC_AXIS_SKIP_DEADZONE,372,94,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Off",IDC_SKIP_DEADZONE_OFF,390,94,20,12 -END - -IDD_CONFIG_NEGCON DIALOGEX 0, 0, 424, 283 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE - // Input bindings: - GROUPBOX "Shoulder buttons",IDC_SHOULDER,220,30,173,34 - PUSHBUTTON "Analog L",ID_L1,233,41,34,15 - PUSHBUTTON "Digital R",ID_R1,346,41,34,15 - GROUPBOX "D-Pad",IDC_DPAD,196,65,108,70 - PUSHBUTTON "Up",ID_DPAD_UP,233,76,34,15 - PUSHBUTTON "Left",ID_DPAD_LEFT,214,95,34,15 - PUSHBUTTON "Right",ID_DPAD_RIGHT,252,95,34,15 - PUSHBUTTON "Down",ID_DPAD_DOWN,233,114,34,15 - GROUPBOX "Digital Face buttons",IDC_FACE,310,65,108,34 - PUSHBUTTON "B",ID_TRIANGLE,327,76,34,15 - PUSHBUTTON "A",ID_CIRCLE,367,76,34,15 - GROUPBOX "Analog Face buttons",IDC_FACE_ANALOG,310,101,108,34 - PUSHBUTTON "II",ID_SQUARE,327,112,34,15 - PUSHBUTTON "I",ID_CROSS,367,112,34,15 - GROUPBOX "Analog Rotating Section",IDC_LSTICK,247,136,124,34 - PUSHBUTTON "Left",ID_LSTICK_LEFT,261,147,30,15 - PUSHBUTTON "Right",ID_LSTICK_RIGHT,327,147,30,15 - PUSHBUTTON "Start",ID_START,207,139,34,15 - PUSHBUTTON "Mouse",ID_MOUSE,207,158,34,15 - // Force Feedback bindings: - GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 - COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 - PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 - // Input options: - PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 - CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER - CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 - PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 - COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 - // Force Feedback & Input configurations: - PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 - PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 - // Input configuration: - GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 - EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP - EDITTEXT IDC_AXIS_CONTROL,349,22,65,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - CONTROL "Flip",IDC_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,37,27,10 - CONTROL "Rapid Fire",IDC_RAPID_FIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,37,44,10 - LTEXT "Sensitivity",IDC_LABEL_SENSITIVITY,202,51,42,8 - CONTROL "",IDC_SLIDER_SENSITIVITY,"msctls_trackbar32",WS_TABSTOP,240,51,131,17 - EDITTEXT IDC_AXIS_SENSITIVITY,372,53,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Dead Zone",IDC_LABEL_DEADZONE,202,71,42,8 - CONTROL "",IDC_SLIDER_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,71,131,17 - EDITTEXT IDC_AXIS_DEADZONE,372,73,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Skip Dead Zone",IDC_LABEL_SKIP_DEADZONE,202,92,42,16 - CONTROL "",IDC_SLIDER_SKIP_DEADZONE,"msctls_trackbar32",WS_TABSTOP,240,92,131,17 - EDITTEXT IDC_AXIS_SKIP_DEADZONE,372,94,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING - LTEXT "Off",IDC_SKIP_DEADZONE_OFF,390,94,20,12 -END - -IDD_GENERAL DIALOGEX 0, 0, 424, 283 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "Input APIs",IDC_STATIC,7,0,410,133 - GROUPBOX "Keyboard API",IDC_STATIC,16,16,192,39 - CONTROL "Windows messaging (Recommended)",IDC_KB_WM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,22,28,137,10 - CONTROL "Raw input",IDC_KB_RAW,"Button",BS_AUTORADIOBUTTON,22,40,112,10 - GROUPBOX "Game Device APIs",IDC_STATIC,16,59,191,62 - CONTROL "DirectInput (Legacy)",IDC_G_DI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,71,100,10 - CONTROL "XInput (Modern)",IDC_G_XI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,82,100,10 - CONTROL "DualShock 3 native mode (Requires sixaxis)",IDC_G_DS3, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,94,155,10 - CONTROL "Monitor when in background",IDC_BACKGROUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,105,107,10 - GROUPBOX "Mouse API",IDC_STATIC,216,16,192,61 - CONTROL "Windows messaging (Recommended)",IDC_M_WM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,223,27,137,10 - CONTROL "Raw input",IDC_M_RAW,"Button",BS_AUTORADIOBUTTON,223,39,112,10 - CONTROL "Disable",IDC_M_DISABLE,"Button",BS_AUTORADIOBUTTON,223,51,39,10 - CONTROL "Start without mouse focus",IDC_MOUSE_UNFOCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,63,98,10 - GROUPBOX "Pads",IDC_STATIC,7,142,410,62 - CONTROL "Port 1 Multitap",IDC_MULTITAP1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,152,63,10 - CONTROL "Port 2 Multitap",IDC_MULTITAP2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,164,63,10 - CONTROL "Multiple bindings",IDC_MULTIPLE_BINDING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,176,66,10 - CONTROL "",IDC_PAD_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP,81,151,183,48,WS_EX_CLIENTEDGE - COMBOBOX IDC_PAD_TYPE,270,151,140,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Device Diagnostics",IDC_STATIC,78,206,264,74 - CONTROL "",IDC_DIAG_LIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,84,217,252,57,WS_EX_CLIENTEDGE - GROUPBOX "Hacks and advanced features",IDC_STATIC,216,82,192,39 - CONTROL "Enable logging",IDC_DEBUG_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,94,79,10 - CONTROL "Guitar Hero 2 Hack",IDC_GH2_HACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,106,79,10 - PUSHBUTTON "Restore Defaults",ID_RESTORE_DEFAULTS,306,168,62,15 - PUSHBUTTON "Load Bindings",ID_LOAD,271,186,62,15 - PUSHBUTTON "Save Bindings",ID_SAVE,345,186,62,15 -END - -IDD_DIAG DIALOGEX 0, 0, 190, 178 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " " -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - CONTROL "",IDC_DIAG_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,176,164,WS_EX_CLIENTEDGE -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 417 - TOPMARGIN, 7 - END - - IDD_CONFIG_POPN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 417 - TOPMARGIN, 7 - END - - IDD_CONFIG_GUITAR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 417 - TOPMARGIN, 7 - END - - IDD_CONFIG_PS1_MOUSE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 417 - TOPMARGIN, 7 - END - - IDD_CONFIG_NEGCON, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 417 - TOPMARGIN, 7 - END - - IDD_GENERAL, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 417 - TOPMARGIN, 7 - END - - IDD_DIAG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 183 - TOPMARGIN, 7 - BOTTOMMARGIN, 171 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// RCDATA -// - -IDR_INI1 RCDATA "Default.ini" - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/pcsx2/PAD/Windows/PADConfig.cpp b/pcsx2/PAD/Windows/PADConfig.cpp deleted file mode 100644 index 2793dd5185..0000000000 --- a/pcsx2/PAD/Windows/PADConfig.cpp +++ /dev/null @@ -1,3120 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" - -#include "common/Path.h" -#include "common/StringUtil.h" - -#include "resource_pad.h" -#include "InputManager.h" -#include "PADConfig.h" - -#include "Tooltips.h" -#include "Diagnostics.h" -#include "DeviceEnumerator.h" -#include "KeyboardQueue.h" -#include "WndProcEater.h" -#include "DualShock3.h" - -// Needed to know if raw input is available. It requires XP or higher. -#include "PADRawInput.h" -#include "Config.h" - -//max len 24 wchar_t -const wchar_t* padTypes[] = { - L"Unplugged", - L"Dualshock 2", - L"Guitar", - L"Pop'n Music controller", - L"PS1 Mouse", - L"neGcon"}; - -GeneralConfig config; -HWND hWndProp = 0; -int selected = 0; -bool quickSetup = false; - -// Older versions of PCSX2 don't always create the ini dir on startup, so PAD does it -// for it. But if PCSX2 sets the ini path with a call to setSettingsDir, then it means -// we shouldn't make our own. -bool createIniDir = true; - -HWND hWnds[2][4][numPadTypes]; -HWND hWndGeneral = 0; - -struct GeneralSettingsBool -{ - wchar_t* name; - unsigned int ControlId; - u8 defaultValue; -}; - -// Ties together config data structure, config files, and general config -// dialog. -const GeneralSettingsBool BoolOptionsInfo[] = { - {L"Mouse Unfocus", IDC_MOUSE_UNFOCUS, 1}, - {L"Background", IDC_BACKGROUND, 1}, - {L"Multiple Bindings", IDC_MULTIPLE_BINDING, 0}, - - {L"DirectInput Game Devices", IDC_G_DI, 1}, - {L"XInput", IDC_G_XI, 1}, - {L"DualShock 3", IDC_G_DS3, 0}, - - {L"Multitap 1", IDC_MULTITAP1, 0}, - {L"Multitap 2", IDC_MULTITAP2, 0}, - - {L"Logging", IDC_DEBUG_FILE, 0}, - - {L"GH2", IDC_GH2_HACK, 0}, -}; - -void Populate(int port, int slot, int padtype); - -void SetupLogSlider(HWND hWndSlider) -{ - SendMessage(hWndSlider, TBM_SETRANGEMIN, 0, 1); - SendMessage(hWndSlider, TBM_SETPAGESIZE, 0, 1 << 13); - SendMessage(hWndSlider, TBM_SETRANGEMAX, 1, 1 << 22); - SendMessage(hWndSlider, TBM_SETTIC, 0, 1 << 21); - SendMessage(hWndSlider, TBM_SETTIC, 0, 1 << 20); - SendMessage(hWndSlider, TBM_SETTIC, 0, 3 << 20); -} - -int GetLogSliderVal(HWND hWnd, int id) -{ - HWND hWndSlider = GetDlgItem(hWnd, id); - int val = SendMessage(hWndSlider, TBM_GETPOS, 0, 0); - if (val <= (1 << 21)) - { - val = (val + 16) >> 5; - } - else - { - double v = (val - (1 << 21)) / (double)((1 << 22) - (1 << 21)); - double max = log((double)(1 << 23)); - double min = log((double)BASE_SENSITIVITY); - v = v * (max - min) + min; - // exp is not implemented in ntdll, so use pow instead. - // More than accurate enough for my needs. - // v = exp(v); - v = pow(2.7182818284590451, v); - if (v > (1 << 23)) - v = (1 << 23); - val = (int)floor(v + 0.5); - } - if (!val) - val = 1; - if (IsDlgButtonChecked(hWnd, id + 1) == BST_CHECKED) - { - val = -val; - } - return val; -} - -void SetLogSliderVal(HWND hWnd, int id, HWND hWndText, int val) -{ - HWND hWndSlider = GetDlgItem(hWnd, id); - int sliderPos = 0; - wchar_t temp[30]; - EnableWindow(hWndSlider, val != 0); - EnableWindow(hWndText, val != 0); - EnableWindow(GetDlgItem(hWnd, id + 1), val != 0); - if (!val) - val = BASE_SENSITIVITY; - CheckDlgButton(hWnd, id + 1, BST_CHECKED * (val < 0)); - if (val < 0) - { - val = -val; - } - if (val <= BASE_SENSITIVITY) - { - sliderPos = val << 5; - } - else - { - double max = log((double)(1 << 23)); - double min = log((double)BASE_SENSITIVITY); - double v = log((double)(val)); - v = (v - min) / (max - min); - v = ((1 << 22) - (1 << 21)) * v + (1 << 21); - // _ftol - sliderPos = (int)(floor(v + 0.5)); - } - SendMessage(hWndSlider, TBM_SETPOS, 1, sliderPos); - int val2 = (int)(1000 * (__int64)val / BASE_SENSITIVITY); - wsprintfW(temp, L"%i.%03i", val2 / 1000, val2 % 1000); - SetWindowTextW(hWndText, temp); -} - -void RefreshEnabledDevices(int updateDeviceList) -{ - // Clears all device state. - static int lastXInputState = -1; - if (updateDeviceList || lastXInputState != config.gameApis.xInput) - { - EnumDevices(config.gameApis.xInput); - lastXInputState = config.gameApis.xInput; - } - - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - - if (!dev->attached && dev->displayName[0] != '[') - { - wchar_t* newName = (wchar_t*)malloc(sizeof(wchar_t) * (wcslen(dev->displayName) + 12)); - wsprintfW(newName, L"[Detached] %s", dev->displayName); - free(dev->displayName); - dev->displayName = newName; - } - - if ((dev->type == KEYBOARD && dev->api == IGNORE_KEYBOARD) || - (dev->type == KEYBOARD && dev->api == config.keyboardApi) || - (dev->type == MOUSE && dev->api == config.mouseApi) || - (dev->type == OTHER && - ((dev->api == DI && config.gameApis.directInput) || - (dev->api == DS3 && config.gameApis.dualShock3) || - (dev->api == XINPUT && config.gameApis.xInput)))) - { - if (config.gameApis.dualShock3 && dev->api == DI && dev->displayName && - !wcsicmp(dev->displayName, L"DX PLAYSTATION(R)3 Controller")) - { - dm->DisableDevice(i); - } - else - { - dm->EnableDevice(i); - } - } - else - { - dm->DisableDevice(i); - } - } -} - -// Disables/enables devices as necessary. Also updates diagnostic list -// and pad1/pad2 bindings lists, depending on params. Also updates device -// list, if indicated. - -// Must be called at some point when entering config mode, as I disable -// (non-keyboard/mice) devices with no active bindings when the emulator's running. -void RefreshEnabledDevicesAndDisplay(int updateDeviceList = 0, HWND hWnd = 0, int populate = 0) -{ - RefreshEnabledDevices(updateDeviceList); - if (hWnd) - { - HWND hWndList = GetDlgItem(hWnd, IDC_DIAG_LIST); - ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_DOUBLEBUFFER, LVS_EX_DOUBLEBUFFER); - int count = ListView_GetItemCount(hWndList); - LVITEM item; - item.iItem = 0; - item.iSubItem = 0; - item.mask = LVIF_TEXT | LVIF_PARAM; - for (int j = 0; j < dm->numDevices; j++) - { - if (dm->devices[j]->enabled && dm->devices[j]->api != IGNORE_KEYBOARD) - { - item.lParam = j; - item.pszText = dm->devices[j]->displayName; - if (count > 0) - { - ListView_SetItem(hWndList, &item); - count--; - } - else - { - ListView_InsertItem(hWndList, &item); - } - item.iItem++; - } - } - // This way, won't scroll list to start. - while (count > 0) - { - ListView_DeleteItem(hWndList, item.iItem); - count--; - } - } - if (populate) - { - for (int j = 0; j < numPadTypes; j++) - { - for (int i = 0; i < 8; i++) - { - Populate(i & 1, i >> 1, j); - } - } - } -} - -wchar_t* GetCommandStringW(u8 command, int port, int slot) -{ - int padtype = config.padConfigs[port][slot].type; - static wchar_t temp[34]; - if (command >= 0x20 && command <= 0x27) - { - if (padtype == GuitarPad && (command == 0x20 || command == 0x22)) - { - HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], 0x40F0 + command); - int res = GetWindowTextW(hWnd, temp, 20); - if ((unsigned int)res - 1 <= 18) - return temp; - } - static wchar_t* stick[2] = {L"L-Stick", L"R-Stick"}; - static wchar_t* dir[] = { - L"Up", L"Right", - L"Down", L"Left"}; - wsprintfW(temp, L"%s %s", padtype == neGconPad ? L"Rotate" : stick[(command - 0x20) / 4], dir[command & 3]); - return temp; - } - /* Get text from the buttons. */ - if (command >= 0x0F && command <= 0x2D) - { - HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], 0x40F0 + command); - if (!hWnd || ((padtype == Dualshock2Pad || padtype == neGconPad) && command >= 0x14 && command <= 0x17)) - { - wchar_t* strings[] = { - L"Mouse", // 0x0F (15) - L"Select", // 0x10 (16) - L"L3", // 0x11 (17) - L"R3", // 0x12 (18) - L"Start", // 0x13 (19) - L"D-Pad Up", // 0x14 (20) - L"D-Pad Right", // 0x15 (21) - L"D-Pad Down", // 0x16 (22) - L"D-Pad Left", // 0x17 (23) - L"L2", // 0x18 (24) - L"R2", // 0x19 (25) - L"L1", // 0x1A (26) - L"R1", // 0x1B (27) - L"Triangle", // 0x1C (28) - L"Circle", // 0x1D (29) - L"Square", // 0x1E (30) - L"Cross", // 0x1F (31) - L"L-Stick Up", // 0x20 (32) - L"L-Stick Right", // 0x21 (33) - L"L-Stick Down", // 0x22 (34) - L"L-Stick Left", // 0x23 (35) - L"R-Stick Up", // 0x24 (36) - L"R-Stick Right", // 0x25 (37) - L"R-Stick Down", // 0x26 (38) - L"R-Stick Left", // 0x27 (39) - L"Analog", // 0x28 (40) - L"Excluded Input", // 0x29 (41) - L"Lock Buttons", // 0x2A (42) - L"Lock Input", // 0x2B (43) - L"Lock Direction", // 0x2C (44) - L"Turbo", // 0x2D (45) - }; - return strings[command - 0xF]; - } - int res = GetWindowTextW(hWnd, temp, 20); - if ((unsigned int)res - 1 <= 18) - return temp; - } - return L""; -} - -static wchar_t iniFileUSB[MAX_PATH * 2] = L"inis/PAD.ini"; - -// we disregard dir and use global settings instead, we should probably clean that up someday... -void PADsetSettingsDir(const char* dir) -{ - //swprintf_s( iniFileUSB, L"%S", (dir==NULL) ? "inis" : dir ); - - //uint targlen = MultiByteToWideChar(CP_ACP, 0, dir, -1, NULL, 0); - StrCpyNW(iniFileUSB, StringUtil::UTF8StringToWideString(Path::Combine(EmuFolders::Settings, "PAD.ini")).c_str(), std::size(iniFileUSB)); - - createIniDir = false; - - FILE* temp = nullptr; - _wfopen_s(&temp, iniFileUSB, L"r"); - if (!temp) - { // File not found, possibly. - HRSRC res = FindResource(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDR_INI1), RT_RCDATA); - if (!res) - return; - HGLOBAL data = LoadResource(GetModuleHandle(nullptr), res); - if (!data) - return; - size_t size = SizeofResource(GetModuleHandle(nullptr), res); - u8* fdata = (u8*)LockResource(data); - _wfopen_s(&temp, iniFileUSB, L"w"); - if (!temp) - return; - fwrite(fdata, 1, size, temp); - fclose(temp); - } - else - { - fclose(temp); - } -} - -int GetBinding(int port, int slot, int index, Device*& dev, Binding*& b, ForceFeedbackBinding*& ffb); -int BindCommand(Device* dev, unsigned int uid, unsigned int port, unsigned int slot, unsigned int padtype, int command, int sensitivity, int rapidFire, int deadZone, int skipDeadZone); - -int CreateEffectBinding(Device* dev, wchar_t* effectName, unsigned int port, unsigned int slot, unsigned int padtype, unsigned int motor, ForceFeedbackBinding** binding); - -void SelChanged(int port, int slot) -{ - int padtype = config.padConfigs[port][slot].type; - HWND hWnd = hWnds[port][slot][padtype]; - if (!hWnd) - return; - HWND hWndTemp, hWndList = GetDlgItem(hWnd, IDC_BINDINGS_LIST); - int i = ListView_GetSelectedCount(hWndList); - wchar_t* devName = L"N/A"; - wchar_t* key = L"N/A"; - wchar_t* command = L"N/A"; - // Second value is now rapidFire. - int rapidFire = -1; - int sensitivity = 0; - int deadZone = 0; - int skipDeadZone = 0; - // Set if sensitivity != 0, but need to disable flip anyways. - // Only used to relative axes. - int disableFlip = 0; - wchar_t temp[4][1000]; - Device* dev; - int bFound = 0; - ForceFeedbackBinding* ffb = 0; - Binding* b = 0; - if (i >= 1) - { - int index = -1; - int flipped = 0; - int nonButtons = 0; - int ffbFound = 0; - while (1) - { - if (!(config.bind && (!config.configureOnBind || quickSetup))) - index = ListView_GetNextItem(hWndList, index, LVNI_SELECTED); - if (index < 0) - break; - LVITEMW item; - item.iItem = index; - item.mask = LVIF_TEXT; - item.pszText = temp[3]; - int j = 0; - for (; j < 3; j++) - { - item.iSubItem = j; - item.cchTextMax = sizeof(temp[0]) / sizeof(temp[3][0]); - if (!ListView_GetItem(hWndList, &item)) - break; - if (!bFound && !ffbFound) - wcscpy(temp[j], temp[3]); - else if (wcsicmp(temp[j], temp[3])) - { - int q = 0; - while (temp[j][q] == temp[3][q]) - q++; - if (q && temp[j][q - 1] == ' ' && temp[j][q] && temp[j][q + 1] == 0) - q--; - if (j == 1) - { - // Really ugly, but merges labels for multiple directions for same axis. - if ((temp[j][q] == 0 || (temp[j][q] == ' ' && temp[j][q + 2] == 0)) && - (temp[3][q] == 0 || (temp[3][q] == ' ' && temp[3][q + 2] == 0))) - { - temp[j][q] = 0; - continue; - } - } - // Merge different directions for same stick. - else if (j == 2 && q > 4) - { - temp[j][q] = 0; - continue; - } - wcscpy(temp[j], L"*"); - } - } - if (j == 3) - { - devName = temp[0]; - key = temp[1]; - command = temp[2]; - if (GetBinding(port, slot, index, dev, b, ffb)) - { - if (b) - { - bFound++; - VirtualControl* control = &dev->virtualControls[b->controlIndex]; - // Only relative axes can't have negative sensitivity. - if (((control->uid >> 16) & 0xFF) == RELAXIS) - { - disableFlip = 1; - } - rapidFire += b->rapidFire; - if (b->sensitivity < 0) - { - flipped++; - sensitivity -= b->sensitivity; - } - else - { - sensitivity += b->sensitivity; - } - if (((control->uid >> 16) & 0xFF) != PSHBTN && ((control->uid >> 16) & 0xFF) != TGLBTN) - { - deadZone += b->deadZone; - skipDeadZone += b->skipDeadZone; - nonButtons++; - } - } - else - ffbFound++; - } - } - } - if ((bFound && ffbFound) || ffbFound > 1) - { - ffb = 0; - rapidFire = -1; - deadZone = 0; - skipDeadZone = 0; - sensitivity = 0; - disableFlip = 1; - bFound = ffbFound = 0; - } - else if (bFound) - { - rapidFire++; - sensitivity /= bFound; - if (nonButtons) - { - deadZone /= nonButtons; - skipDeadZone /= nonButtons; - } - if (bFound > 1) - disableFlip = 1; - else if (flipped) - { - sensitivity = -sensitivity; - } - } - } - config.bind = false; - - // Input & Special Bindings: - SetWindowTextW(GetDlgItem(hWnd, ID_SPECIAL_INPUTS), config.specialInputs[port][slot] ? L"Hide Special Inputs" : L"Show Special Inputs"); - for (i = IDC_DPAD; i <= ID_SPECIAL_INPUTS; i++) - { - hWndTemp = GetDlgItem(hWnd, i); - if (hWndTemp) - { - if (i >= ID_EXCLUDE && i <= ID_TURBO_KEY) - ShowWindow(hWndTemp, !ffb && !b && config.specialInputs[port][slot]); - else - ShowWindow(hWndTemp, !ffb && !b); - } - } - // Input configuration: - for (i = IDC_SLIDER_SENSITIVITY; i <= IDC_AXIS_SKIP_DEADZONE; i++) - { - hWndTemp = GetDlgItem(hWnd, i); - if (hWndTemp) - ShowWindow(hWndTemp, !ffb && b); - if (i == IDC_SKIP_DEADZONE_OFF && skipDeadZone > deadZone) - ShowWindow(hWndTemp, 0); - if (i == IDC_AXIS_SKIP_DEADZONE && skipDeadZone <= deadZone) - ShowWindow(hWndTemp, 0); - } - // Pad Force Feedback configuration: - for (i = ID_TEST; i <= IDC_FF_AXIS8_SCALE; i++) - { - hWndTemp = GetDlgItem(hWnd, i); - if (hWndTemp) - { - int enable = ffb != 0; - if (ffb && i >= IDC_FF_AXIS1_ENABLED) - { - int index = (i - IDC_FF_AXIS1_ENABLED) / 16; - if (index >= dev->numFFAxes) - { - enable = 0; - } - else - { - int type = i - index * 16; - AxisEffectInfo* info = 0; - if (dev->numFFAxes > index) - { - info = ffb->axes + index; - } - if (type == IDC_FF_AXIS1) - { - // takes care of IDC_FF_AXIS1_FLIP as well. - SetupLogSlider(hWndTemp); - int force = 0; - if (info) - { - force = info->force; - } - SetLogSliderVal(hWnd, i, GetDlgItem(hWnd, i - IDC_FF_AXIS1 + IDC_FF_AXIS1_SCALE), force); - } - else if (type == IDC_FF_AXIS1_ENABLED) - { - CheckDlgButton(hWnd, i, BST_CHECKED * (info->force != 0)); - wsprintfW(temp[0], L"Axis %i", index + 1); - if (dev->ffAxes[index].displayName && wcslen(dev->ffAxes[index].displayName) < 50) - { - wchar_t* end = wcschr(temp[0], 0); - wsprintfW(end, L": %s", dev->ffAxes[index].displayName); - } - SetWindowText(hWndTemp, temp[0]); - } - } - } - ShowWindow(hWndTemp, enable); - } - } - ShowWindow(GetDlgItem(hWnd, ID_CONTROLS), ffb || b); - ShowWindow(GetDlgItem(hWnd, ID_RESET_CONFIG), ffb || b); - - if (!ffb) - { - SetLogSliderVal(hWnd, IDC_SLIDER_SENSITIVITY, GetDlgItem(hWnd, IDC_AXIS_SENSITIVITY), sensitivity); - SetLogSliderVal(hWnd, IDC_SLIDER_DEADZONE, GetDlgItem(hWnd, IDC_AXIS_DEADZONE), deadZone); - SetLogSliderVal(hWnd, IDC_SLIDER_SKIP_DEADZONE, GetDlgItem(hWnd, IDC_AXIS_SKIP_DEADZONE), skipDeadZone); - - if (disableFlip) - EnableWindow(GetDlgItem(hWnd, IDC_FLIP), 0); - - EnableWindow(GetDlgItem(hWnd, IDC_RAPID_FIRE), rapidFire >= 0); - if (rapidFire > 0 && rapidFire < bFound) - { - SendMessage(GetDlgItem(hWnd, IDC_RAPID_FIRE), BM_SETSTYLE, BS_AUTO3STATE, 0); - CheckDlgButton(hWnd, IDC_RAPID_FIRE, BST_INDETERMINATE); - } - else - { - SendMessage(GetDlgItem(hWnd, IDC_RAPID_FIRE), BM_SETSTYLE, BS_AUTOCHECKBOX, 0); - CheckDlgButton(hWnd, IDC_RAPID_FIRE, BST_CHECKED * (bFound && rapidFire == bFound)); - } - HWND hWndCombo = GetDlgItem(hWnd, IDC_AXIS_DIRECTION); - int enableCombo = 0; - SendMessage(hWndCombo, CB_RESETCONTENT, 0, 0); - if (b && bFound == 1) - { - VirtualControl* control = &dev->virtualControls[b->controlIndex]; - unsigned int uid = control->uid; - if (((uid >> 16) & 0xFF) == ABSAXIS) - { - enableCombo = 1; - wchar_t* endings[3] = {L" -", L" +", L""}; - wchar_t* string = temp[3]; - wcscpy(string, key); - wchar_t* end = wcschr(string, 0); - int sel = 2; - if (!(uid & UID_AXIS)) - { - end[-2] = 0; - sel = (end[-1] == '+'); - end -= 2; - } - for (int i = 0; i < 3; i++) - { - wcscpy(end, endings[i]); - SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM)string); - if (i == sel) - SendMessage(hWndCombo, CB_SETCURSEL, i, 0); - } - } - } - EnableWindow(hWndCombo, enableCombo); - if (!enableCombo) - { - SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM)key); - SendMessage(hWndCombo, CB_SELECTSTRING, i, (LPARAM)key); - } - - SetDlgItemText(hWnd, IDC_AXIS_DEVICE, devName); - SetDlgItemText(hWnd, IDC_AXIS_CONTROL, command); - } - else - { - wchar_t temp2[2000]; - wsprintfW(temp2, L"%s / %s", devName, command); - SetDlgItemText(hWnd, ID_FF, temp2); - - hWndTemp = GetDlgItem(hWnd, IDC_FF_EFFECT); - SendMessage(hWndTemp, CB_RESETCONTENT, 0, 0); - for (i = 0; i < dev->numFFEffectTypes; i++) - { - SendMessage(hWndTemp, CB_INSERTSTRING, i, (LPARAM)dev->ffEffectTypes[i].displayName); - } - SendMessage(hWndTemp, CB_SETCURSEL, ffb->effectIndex, 0); - EnableWindow(hWndTemp, dev->numFFEffectTypes > 1); - } -} - -void UnselectAll(HWND hWnd) -{ - int i = ListView_GetSelectedCount(hWnd); - while (i-- > 0) - { - int index = ListView_GetNextItem(hWnd, -1, LVNI_SELECTED); - ListView_SetItemState(hWnd, index, 0, LVIS_SELECTED); - } -} - - -int GetItemIndex(int port, int slot, Device* dev, ForceFeedbackBinding* binding) -{ - int count = 0; - int padtype = config.padConfigs[port][slot].type; - int selectedDevice = config.deviceSelect[port][slot]; - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev2 = dm->devices[i]; - if (!dev2->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev2) - continue; - if (dev2 != dev) - { - count += dev2->pads[port][slot][padtype].numBindings + dev2->pads[port][slot][padtype].numFFBindings; - continue; - } - return count += dev2->pads[port][slot][padtype].numBindings + (binding - dev2->pads[port][slot][padtype].ffBindings); - } - return -1; -} -int GetItemIndex(int port, int slot, Device* dev, Binding* binding) -{ - int count = 0; - int padtype = config.padConfigs[port][slot].type; - int selectedDevice = config.deviceSelect[port][slot]; - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev2 = dm->devices[i]; - if (!dev2->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev2) - continue; - if (dev2 != dev) - { - count += dev2->pads[port][slot][padtype].numBindings + dev2->pads[port][slot][padtype].numFFBindings; - continue; - } - return count += binding - dev->pads[port][slot][padtype].bindings; - } - return -1; -} - -// Doesn't check if already displayed. -int ListBoundCommand(int port, int slot, Device* dev, Binding* b) -{ - int padtype = config.padConfigs[port][slot].type; - if (!hWnds[port][slot][padtype]) - return -1; - HWND hWndList = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - int index = -1; - if (hWndList) - { - index = GetItemIndex(port, slot, dev, b); - if (index >= 0) - { - LVITEM item; - item.mask = LVIF_TEXT; - item.pszText = dev->displayName; - item.iItem = index; - item.iSubItem = 0; - SendMessage(hWndList, LVM_INSERTITEM, 0, (LPARAM)&item); - item.mask = LVIF_TEXT; - item.iSubItem = 1; - item.pszText = dev->GetVirtualControlName(&dev->virtualControls[b->controlIndex]); - SendMessage(hWndList, LVM_SETITEM, 0, (LPARAM)&item); - item.iSubItem = 2; - item.pszText = GetCommandStringW(b->command, port, slot); - SendMessage(hWndList, LVM_SETITEM, 0, (LPARAM)&item); - } - } - return index; -} - -int ListBoundEffect(int port, int slot, Device* dev, ForceFeedbackBinding* b) -{ - int padtype = config.padConfigs[port][slot].type; - if (!hWnds[port][slot][padtype]) - return -1; - HWND hWndList = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - int index = -1; - if (hWndList) - { - index = GetItemIndex(port, slot, dev, b); - if (index >= 0) - { - LVITEM item; - item.mask = LVIF_TEXT; - item.pszText = dev->displayName; - item.iItem = index; - item.iSubItem = 0; - SendMessage(hWndList, LVM_INSERTITEM, 0, (LPARAM)&item); - item.mask = LVIF_TEXT; - item.iSubItem = 1; - item.pszText = dev->ffEffectTypes[b->effectIndex].displayName; - SendMessage(hWndList, LVM_SETITEM, 0, (LPARAM)&item); - item.iSubItem = 2; - wchar_t* ps2Motors[2] = {L"Big Motor", L"Small Motor"}; - item.pszText = ps2Motors[b->motor]; - SendMessage(hWndList, LVM_SETITEM, 0, (LPARAM)&item); - } - } - return index; -} - -// Only for use with control bindings. Affects all highlighted bindings. -void ChangeValue(int port, int slot, int* newSensitivity, int* newRapidFire, int* newDeadZone, int* newSkipDeadZone) -{ - int padtype = config.padConfigs[port][slot].type; - if (!hWnds[port][slot][padtype]) - return; - HWND hWndList = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - int count = ListView_GetSelectedCount(hWndList); - if (count < 1) - return; - int index = -1; - while (1) - { - index = ListView_GetNextItem(hWndList, index, LVNI_SELECTED); - if (index < 0) - break; - Device* dev; - Binding* b; - ForceFeedbackBinding* ffb; - if (!GetBinding(port, slot, index, dev, b, ffb) || ffb) - return; - if (newSensitivity) - { - // Don't change flip state when modifying multiple controls. - if (count > 1 && b->sensitivity < 0) - b->sensitivity = -*newSensitivity; - else - b->sensitivity = *newSensitivity; - } - if (newDeadZone) - { - if (b->deadZone) - { - b->deadZone = *newDeadZone; - } - } - if (newSkipDeadZone) - { - if (b->skipDeadZone) - { - b->skipDeadZone = *newSkipDeadZone; - } - } - if (newRapidFire) - { - b->rapidFire = *newRapidFire; - } - } - PropSheet_Changed(hWndProp, hWnds[port][slot][padtype]); - SelChanged(port, slot); -} - -// Only for use with effect bindings. -void ChangeEffect(int port, int slot, int id, int* newForce, unsigned int* newEffectType) -{ - int padtype = config.padConfigs[port][slot].type; - if (!hWnds[port][slot][padtype]) - return; - HWND hWndList = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - int i = ListView_GetSelectedCount(hWndList); - if (i != 1) - return; - int index = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - Device* dev; - Binding* b; - ForceFeedbackBinding* ffb; - if (!GetBinding(port, slot, index, dev, b, ffb) || b) - return; - if (newForce) - { - unsigned int axisIndex = (id - IDC_FF_AXIS1_ENABLED) / 16; - if (axisIndex < (unsigned int)dev->numFFAxes) - { - ffb->axes[axisIndex].force = *newForce; - } - } - if (newEffectType && *newEffectType < (unsigned int)dev->numFFEffectTypes) - { - ffb->effectIndex = *newEffectType; - ListView_DeleteItem(hWndList, index); - index = ListBoundEffect(port, slot, dev, ffb); - ListView_SetItemState(hWndList, index, LVIS_SELECTED, LVIS_SELECTED); - } - PropSheet_Changed(hWndProp, hWnds[port][slot][padtype]); - SelChanged(port, slot); -} - - - -void Populate(int port, int slot, int padtype) -{ - if (!hWnds[port][slot][padtype]) - return; - HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - ListView_DeleteAllItems(hWnd); - - int multipleBinding = config.multipleBinding; - config.multipleBinding = 1; - int selectedDevice = config.deviceSelect[port][slot]; - for (int j = 0; j < dm->numDevices; j++) - { - Device* dev = dm->devices[j]; - if (!dev->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev) - continue; - for (int i = 0; i < dev->pads[port][slot][padtype].numBindings; i++) - { - ListBoundCommand(port, slot, dev, dev->pads[port][slot][padtype].bindings + i); - } - for (int i = 0; i < dev->pads[port][slot][padtype].numFFBindings; i++) - { - ListBoundEffect(port, slot, dev, dev->pads[port][slot][padtype].ffBindings + i); - } - } - config.multipleBinding = multipleBinding; - - hWnd = GetDlgItem(hWnds[port][slot][padtype], IDC_FORCEFEEDBACK); - SendMessage(hWnd, CB_RESETCONTENT, 0, 0); - int added = 0; - bool enable = false; - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - if (dev->enabled && dev->numFFAxes && dev->numFFEffectTypes) - { - SendMessage(hWnd, CB_INSERTSTRING, added, (LPARAM)dev->displayName); - SendMessage(hWnd, CB_SETITEMDATA, added, i); - added++; - - int selectedDevice = config.deviceSelect[port][slot]; - if (selectedDevice == -1 || dm->devices[selectedDevice] == dev) - { - enable = true; - } - } - } - SendMessage(hWnd, CB_SETCURSEL, 0, 0); - EnableWindow(hWnd, added != 0 && enable); - EnableWindow(GetDlgItem(hWnds[port][slot][padtype], ID_BIG_MOTOR), added != 0 && enable); - EnableWindow(GetDlgItem(hWnds[port][slot][padtype], ID_SMALL_MOTOR), added != 0 && enable); - SelChanged(port, slot); -} - -int WritePrivateProfileInt(wchar_t* s1, wchar_t* s2, int v, wchar_t* ini) -{ - wchar_t temp[100]; - _itow(v, temp, 10); - return WritePrivateProfileStringW(s1, s2, temp, ini); -} - -int SaveSettings(wchar_t* file = 0) -{ - - // Need this either way for saving path. - if (!file) - { - file = iniFileUSB; - } - else - { - wchar_t* c = wcsrchr(file, '\\'); - if (*c) - { - *c = 0; - wcscpy(config.lastSaveConfigPath, file); - wcscpy(config.lastSaveConfigFileName, c + 1); - *c = '\\'; - } - } - DeleteFileW(file); - - WritePrivateProfileStringW(L"General Settings", L"Last Config Path", config.lastSaveConfigPath, iniFileUSB); - WritePrivateProfileStringW(L"General Settings", L"Last Config Name", config.lastSaveConfigFileName, iniFileUSB); - - // Just check first, last, and all pad bindings. Should be more than enough. No real need to check - // config path. - int noError = 1; - - for (int i = 0; i < sizeof(BoolOptionsInfo) / sizeof(BoolOptionsInfo[0]); i++) - { - noError &= WritePrivateProfileInt(L"General Settings", BoolOptionsInfo[i].name, config.bools[i], file); - } - - WritePrivateProfileInt(L"General Settings", L"Keyboard Mode", config.keyboardApi, file); - WritePrivateProfileInt(L"General Settings", L"Mouse Mode", config.mouseApi, file); - - WritePrivateProfileInt(L"Pad Settings", L"Configure On Bind", config.configureOnBind, file); - - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - wchar_t temp[50]; - wsprintf(temp, L"Pad %i %i", port, slot); - WritePrivateProfileInt(temp, L"Mode", config.padConfigs[port][slot].type, file); - } - } - - for (int i = 0; i < dm->numDevices; i++) - { - wchar_t id[50]; - wchar_t temp[50], temp2[1000]; - wsprintfW(id, L"Device %i", i); - Device* dev = dm->devices[i]; - wchar_t* name = dev->displayName; - while (name[0] == '[') - { - wchar_t* name2 = wcschr(name, ']'); - if (!name2) - break; - name = name2 + 1; - while (iswspace(name[0])) - name++; - } - WritePrivateProfileStringW(id, L"Display Name", name, file); - WritePrivateProfileStringW(id, L"Instance ID", dev->instanceID, file); - if (dev->productID) - { - WritePrivateProfileStringW(id, L"Product ID", dev->productID, file); - } - WritePrivateProfileInt(id, L"API", dev->api, file); - WritePrivateProfileInt(id, L"Type", dev->type, file); - int ffBindingCount = 0; - int bindingCount = 0; - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - for (int padtype = 0; padtype < numPadTypes; padtype++) - { - for (int j = 0; j < dev->pads[port][slot][padtype].numBindings; j++) - { - Binding* b = dev->pads[port][slot][padtype].bindings + j; - VirtualControl* c = &dev->virtualControls[b->controlIndex]; - wsprintfW(temp, L"Binding %i", bindingCount++); - wsprintfW(temp2, L"0x%08X, %i, %i, %i, %i, %i, %i, %i, %i", c->uid, port, b->command, b->sensitivity, b->rapidFire, slot, b->deadZone, b->skipDeadZone, padtype); - noError &= WritePrivateProfileStringW(id, temp, temp2, file); - } - for (int j = 0; j < dev->pads[port][slot][padtype].numFFBindings; j++) - { - ForceFeedbackBinding* b = dev->pads[port][slot][padtype].ffBindings + j; - ForceFeedbackEffectType* eff = &dev->ffEffectTypes[b->effectIndex]; - wsprintfW(temp, L"FF Binding %i", ffBindingCount++); - wsprintfW(temp2, L"%s %i, %i, %i, %i", eff->effectID, port, b->motor, slot, padtype); - for (int k = 0; k < dev->numFFAxes; k++) - { - ForceFeedbackAxis* axis = dev->ffAxes + k; - AxisEffectInfo* info = b->axes + k; - wsprintfW(wcschr(temp2, 0), L", %i, %i", axis->id, info->force); - } - noError &= WritePrivateProfileStringW(id, temp, temp2, file); - } - } - } - } - } - if (!noError) - { - MessageBoxA(hWndProp, "Unable to save settings. Make sure the disk is not full or write protected, the file isn't write protected, and that the app has permissions to write to the directory. Try running in administrator mode.", "Error Writing Configuration File", MB_OK | MB_ICONERROR); - } - return !noError; -} - -u8 GetPrivateProfileBool(wchar_t* s1, wchar_t* s2, int def, wchar_t* ini) -{ - return (0 != GetPrivateProfileIntW(s1, s2, def, ini)); -} - -int LoadSettings(int force, wchar_t* file) -{ - if (dm && !force) - return 0; - - if (createIniDir) - { - PADsetSettingsDir("inis"); - createIniDir = false; - } - - // Could just do ClearDevices() instead, but if I ever add any extra stuff, - // this will still work. - UnloadConfigs(); - dm = new InputDeviceManager(); - - if (!file) - { - file = iniFileUSB; - GetPrivateProfileStringW(L"General Settings", L"Last Config Path", L"inis", config.lastSaveConfigPath, sizeof(config.lastSaveConfigPath), file); - GetPrivateProfileStringW(L"General Settings", L"Last Config Name", L"PAD.pad", config.lastSaveConfigFileName, sizeof(config.lastSaveConfigFileName), file); - } - else - { - wchar_t* c = wcsrchr(file, '\\'); - if (c) - { - *c = 0; - wcscpy(config.lastSaveConfigPath, file); - wcscpy(config.lastSaveConfigFileName, c + 1); - *c = '\\'; - WritePrivateProfileStringW(L"General Settings", L"Last Config Path", config.lastSaveConfigPath, iniFileUSB); - WritePrivateProfileStringW(L"General Settings", L"Last Config Name", config.lastSaveConfigFileName, iniFileUSB); - } - } - - for (int i = 0; i < sizeof(BoolOptionsInfo) / sizeof(BoolOptionsInfo[0]); i++) - { - config.bools[i] = GetPrivateProfileBool(L"General Settings", BoolOptionsInfo[i].name, BoolOptionsInfo[i].defaultValue, file); - } - - config.keyboardApi = (DeviceAPI)GetPrivateProfileIntW(L"General Settings", L"Keyboard Mode", WM, file); - if (!config.keyboardApi) - config.keyboardApi = WM; - config.mouseApi = (DeviceAPI)GetPrivateProfileIntW(L"General Settings", L"Mouse Mode", 0, file); - - config.configureOnBind = (DeviceAPI)GetPrivateProfileIntW(L"Pad Settings", L"Configure On Bind", 0, file); - - if (config.debug) - { - CreateDirectory(L"logs", 0); - } - - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - wchar_t temp[50]; - wsprintf(temp, L"Pad %i %i", port, slot); - config.padConfigs[port][slot].type = (PadType)GetPrivateProfileInt(temp, L"Mode", Dualshock2Pad, file); - } - } - - bool oldIni = false; - int i = 0; - int multipleBinding = config.multipleBinding; - // Disabling multiple binding only prevents new multiple bindings. - config.multipleBinding = 1; - while (1) - { - wchar_t id[50]; - wchar_t temp[50], temp2[1000], temp3[1000], temp4[1000]; - wsprintfW(id, L"Device %i", i++); - if (!GetPrivateProfileStringW(id, L"Display Name", 0, temp2, 1000, file) || !temp2[0] || - !GetPrivateProfileStringW(id, L"Instance ID", 0, temp3, 1000, file) || !temp3[0]) - { - if (i >= 100) - break; - continue; - } - wchar_t* id2 = 0; - if (GetPrivateProfileStringW(id, L"Product ID", 0, temp4, 1000, file) && temp4[0]) - id2 = temp4; - - int api = GetPrivateProfileIntW(id, L"API", 0, file); - int type = GetPrivateProfileIntW(id, L"Type", 0, file); - if (!api || !type) - continue; - - Device* dev = new Device((DeviceAPI)api, (DeviceType)type, temp2, temp3, id2); - dev->attached = 0; - dm->AddDevice(dev); - int j = 0; - int last = 0; - while (1) - { - wsprintfW(temp, L"Binding %i", j++); - if (!GetPrivateProfileStringW(id, temp, 0, temp2, 1000, file)) - { - if (j >= 100) - { - if (!last) - break; - last = 0; - } - continue; - } - last = 1; - unsigned int uid; - int port, command, sensitivity, rapidFire, slot = 0, deadZone = 0, skipDeadZone = 0, padtype = 0; - int w = 0; - char string[1000]; - while (temp2[w]) - { - string[w] = (char)temp2[w]; - w++; - } - string[w] = 0; - int len = sscanf(string, " %i , %i , %i , %i , %i , %i , %i , %i , %i", &uid, &port, &command, &sensitivity, &rapidFire, &slot, &deadZone, &skipDeadZone, &padtype); - if (len >= 5 && type) - { - VirtualControl* c = dev->GetVirtualControl(uid); - if (!c) - c = dev->AddVirtualControl(uid, -1); - if (c) - { - if (len < 8) - { // If ini file is imported from older version, make sure bindings aren't applied to "Unplugged" padtype. - oldIni = true; - if (config.padConfigs[port][slot].type != 0) - { - padtype = config.padConfigs[port][slot].type; - } - else - { - padtype = 1; - } - } - else if (len == 8) - { - padtype = skipDeadZone; - skipDeadZone = 0; - } - BindCommand(dev, uid, port, slot, padtype, command, sensitivity, rapidFire, deadZone, skipDeadZone); - } - } - } - j = 0; - while (1) - { - wsprintfW(temp, L"FF Binding %i", j++); - if (!GetPrivateProfileStringW(id, temp, 0, temp2, 1000, file)) - { - if (j >= 10) - { - if (!last) - break; - last = 0; - } - continue; - } - last = 1; - int port, slot, motor, padtype; - int w = 0; - char string[1000]; - char effect[1000]; - while (temp2[w]) - { - string[w] = (char)temp2[w]; - w++; - } - string[w] = 0; - // wcstok not in ntdll. More effore than its worth to shave off - // whitespace without it. - if (sscanf(string, " %100s %i , %i , %i , %i", effect, &port, &motor, &slot, &padtype) == 5) - { - char* s; - if (oldIni) - { // Make sure bindings aren't applied to "Unplugged" padtype and FF settings are read from old location. - if (config.padConfigs[port][slot].type != 0) - { - padtype = config.padConfigs[port][slot].type; - } - else - { - padtype = 1; - } - s = strchr(strchr(strchr(string, ',') + 1, ',') + 1, ','); - } - else - { - s = strchr(strchr(strchr(strchr(string, ',') + 1, ',') + 1, ',') + 1, ','); - } - if (!s) - continue; - s++; - w = 0; - while (effect[w]) - { - temp2[w] = effect[w]; - w++; - } - temp2[w] = 0; - ForceFeedbackEffectType* eff = dev->GetForcefeedbackEffect(temp2); - if (!eff) - { - // At the moment, don't record effect types. - // Only used internally, anyways, so not an issue. - dev->AddFFEffectType(temp2, temp2, EFFECT_CONSTANT); - // eff = &dev->ffEffectTypes[dev->numFFEffectTypes-1]; - } - ForceFeedbackBinding* b; - CreateEffectBinding(dev, temp2, port, slot, padtype, motor, &b); - if (b) - { - while (1) - { - int axisID = atoi(s); - if (!(s = strchr(s, ','))) - break; - s++; - int force = atoi(s); - int i; - for (i = 0; i < dev->numFFAxes; i++) - { - if (axisID == dev->ffAxes[i].id) - break; - } - if (i == dev->numFFAxes) - { - dev->AddFFAxis(L"?", axisID); - } - b->axes[i].force = force; - if (!(s = strchr(s, ','))) - break; - s++; - } - } - } - } - } - config.multipleBinding = multipleBinding; - - RefreshEnabledDevicesAndDisplay(1); - - return 0; -} - -inline int GetPort(HWND hWnd, int* slot) -{ - if (sizeof(hWnds) / sizeof(hWnds[0][0][0]) != (2 * 4 * numPadTypes)) - MessageBoxA(hWndProp, "The number of detected configurations does not equal the expected number of configurations.", "Pad configurations error", MB_OK | MB_ICONERROR); - for (int j = 0; j < numPadTypes; j++) - { - for (int i = 0; i < 8; i++) - { - if (hWnds[i & 1][i >> 1][j] == hWnd) - { - *slot = i >> 1; - return i & 1; - } - } - } - *slot = 0; - return 0; -} - -void Diagnostics(HWND hWnd) -{ - HWND hWndList = GetDlgItem(hWnd, IDC_DIAG_LIST); - if (!hWndList) - return; - int index = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - if (index < 0) - return; - LVITEM item; - memset(&item, 0, sizeof(item)); - item.mask = LVIF_PARAM; - item.iSubItem = 0; - item.iItem = index; - if (!ListView_GetItem(hWndList, &item)) - return; - Diagnose(item.lParam, hWnd); - RefreshEnabledDevicesAndDisplay(0, hWnd, 1); -} - -// Tooltips will only show if the TOOLINFO cbSize <= the struct size. If it's -// smaller some functionality might be disabled. So let's try and use the -// correct size. -UINT GetTooltipStructSize() -{ - DLLGETVERSIONPROC dllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(GetModuleHandle(L"ComCtl32.dll"), "DllGetVersion"); - if (dllGetVersion) - { - DLLVERSIONINFO2 dllversion = {0}; - dllversion.info1.cbSize = sizeof(DLLVERSIONINFO2); - - if (dllGetVersion((DLLVERSIONINFO*)&dllversion) == S_OK) - { - // Minor, then major version. - DWORD version = MAKELONG(dllversion.info1.dwMinorVersion, dllversion.info1.dwMajorVersion); - DWORD tooltip_v3 = MAKELONG(0, 6); - if (version >= tooltip_v3) - return TTTOOLINFOA_V3_SIZE; - } - } - // Should be fine for XP and onwards, comctl versions >= 4.7 should at least - // be this size. - return TTTOOLINFOA_V2_SIZE; -} - -void AddTooltip(UINT id, HWND hWnd) -{ - static UINT tooltipStructSize = GetTooltipStructSize(); - bool hasTooltip; - LPWSTR message = pad_dialog_message(id, &hasTooltip); - if (!hasTooltip) - return; - - HWND hWndTooltip = GetDlgItem(hWnd, id); - if (hWndTooltip == NULL) - return; - - // TTS_NOPREFIX allows tabs and '&' to be used. - HWND hWndTip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, - TTS_ALWAYSTIP | TTS_NOPREFIX, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hWnd, NULL, GetModuleHandle(nullptr), NULL); - if (hWndTip == NULL) - return; - - TOOLINFO toolInfo = {0}; - toolInfo.cbSize = tooltipStructSize; - toolInfo.hwnd = hWnd; - toolInfo.uFlags = TTF_IDISHWND | TTF_SUBCLASS; - toolInfo.uId = (UINT_PTR)hWndTooltip; - toolInfo.lpszText = message; - SendMessage(hWndTip, TTM_ADDTOOL, 0, (LPARAM)&toolInfo); - // 32.767s is the max show time. - SendMessage(hWndTip, TTM_SETDELAYTIME, TTDT_AUTOPOP, 32767); - // Setting a maximum width is necessary for displaying longer messages. - SendMessage(hWndTip, TTM_SETMAXTIPWIDTH, 0, 400); -} - -int GetBinding(int port, int slot, int index, Device*& dev, Binding*& b, ForceFeedbackBinding*& ffb) -{ - ffb = 0; - b = 0; - int padtype = config.padConfigs[port][slot].type; - int selectedDevice = config.deviceSelect[port][slot]; - for (int i = 0; i < dm->numDevices; i++) - { - dev = dm->devices[i]; - if (!dev->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev) - continue; - if (index < dev->pads[port][slot][padtype].numBindings) - { - b = dev->pads[port][slot][padtype].bindings + index; - return 1; - } - index -= dev->pads[port][slot][padtype].numBindings; - - if (index < dev->pads[port][slot][padtype].numFFBindings) - { - ffb = dev->pads[port][slot][padtype].ffBindings + index; - return 1; - } - index -= dev->pads[port][slot][padtype].numFFBindings; - } - return 0; -} - -// Only used when deleting things from ListView. Will remove from listview if needed. -void DeleteBinding(int port, int slot, int padtype, Device* dev, Binding* b) -{ - if (dev->enabled && hWnds[port][slot][padtype]) - { - int count = GetItemIndex(port, slot, dev, b); - if (count >= 0) - { - HWND hWndList = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - if (hWndList) - { - ListView_DeleteItem(hWndList, count); - } - } - } - Binding* bindings = dev->pads[port][slot][padtype].bindings; - int i = b - bindings; - memmove(bindings + i, bindings + i + 1, sizeof(Binding) * (dev->pads[port][slot][padtype].numBindings - i - 1)); - dev->pads[port][slot][padtype].numBindings--; -} - -void DeleteFFBinding(int port, int slot, Device* dev, ForceFeedbackBinding* b) -{ - int padtype = config.padConfigs[port][slot].type; - if (dev->enabled && hWnds[port][slot][padtype]) - { - int count = GetItemIndex(port, slot, dev, b); - if (count >= 0) - { - HWND hWndList = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - if (hWndList) - { - ListView_DeleteItem(hWndList, count); - } - } - } - ForceFeedbackBinding* bindings = dev->pads[port][slot][padtype].ffBindings; - int i = b - bindings; - memmove(bindings + i, bindings + i + 1, sizeof(Binding) * (dev->pads[port][slot][padtype].numFFBindings - i - 1)); - dev->pads[port][slot][padtype].numFFBindings--; -} - -int DeleteByIndex(int port, int slot, int index) -{ - int padtype = config.padConfigs[port][slot].type; - ForceFeedbackBinding* ffb; - Binding* b; - Device* dev; - if (GetBinding(port, slot, index, dev, b, ffb)) - { - if (b) - { - DeleteBinding(port, slot, padtype, dev, b); - } - else - { - DeleteFFBinding(port, slot, dev, ffb); - } - return 1; - } - return 0; -} - -int DeleteSelected(int port, int slot) -{ - int padtype = config.padConfigs[port][slot].type; - if (!hWnds[port][slot][padtype]) - return 0; - HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); - int changes = 0; - while (1) - { - int index = ListView_GetNextItem(hWnd, -1, LVNI_SELECTED); - if (index < 0) - break; - changes += DeleteByIndex(port, slot, index); - } - //ShowScrollBar(hWnd, SB_VERT, 1); - return changes; -} - -int CreateEffectBinding(Device* dev, wchar_t* effectID, unsigned int port, unsigned int slot, unsigned int padtype, unsigned int motor, ForceFeedbackBinding** binding) -{ - // Checks needed because I use this directly when loading bindings. - // Note: dev->numFFAxes *can* be 0, for loading from file. - *binding = 0; - if (port > 1 || slot > 3 || motor > 1 || !dev->numFFEffectTypes) - { - return -1; - } - ForceFeedbackEffectType* eff = 0; - if (effectID) - { - eff = dev->GetForcefeedbackEffect(effectID); - } - if (!eff) - { - eff = dev->ffEffectTypes; - } - if (!eff) - { - return -1; - } - int effectIndex = eff - dev->ffEffectTypes; - dev->pads[port][slot][padtype].ffBindings = (ForceFeedbackBinding*)realloc(dev->pads[port][slot][padtype].ffBindings, (dev->pads[port][slot][padtype].numFFBindings + 1) * sizeof(ForceFeedbackBinding)); - int newIndex = dev->pads[port][slot][padtype].numFFBindings; - while (newIndex && dev->pads[port][slot][padtype].ffBindings[newIndex - 1].motor >= motor) - { - dev->pads[port][slot][padtype].ffBindings[newIndex] = dev->pads[port][slot][padtype].ffBindings[newIndex - 1]; - newIndex--; - } - ForceFeedbackBinding* b = dev->pads[port][slot][padtype].ffBindings + newIndex; - b->axes = (AxisEffectInfo*)calloc(dev->numFFAxes, sizeof(AxisEffectInfo)); - b->motor = motor; - b->effectIndex = effectIndex; - dev->pads[port][slot][padtype].numFFBindings++; - if (binding) - *binding = b; - return ListBoundEffect(port, slot, dev, b); -} - -int BindCommand(Device* dev, unsigned int uid, unsigned int port, unsigned int slot, unsigned int padtype, int command, int sensitivity, int rapidFire, int deadZone, int skipDeadZone) -{ - // Checks needed because I use this directly when loading bindings. - if (port > 1 || slot > 3 || padtype >= numPadTypes) - return -1; - - if (!sensitivity) - { - if (((uid >> 16) & 0xFF) == ABSAXIS) - { - sensitivity = BASE_ANALOG_SENSITIVITY; - } - else - { - sensitivity = BASE_SENSITIVITY; - } - } - if ((uid >> 16) & (PSHBTN | TGLBTN)) - { - deadZone = 0; - skipDeadZone = 0; - } - else if (!deadZone) - { - if ((uid >> 16) & PRESSURE_BTN) - { - deadZone = 1; - } - else - { - deadZone = DEFAULT_DEADZONE; - } - } - else if (!skipDeadZone) - { - skipDeadZone = 1; - } - - // Relative axes can have negative sensitivity. - else if (((uid >> 16) & 0xFF) == RELAXIS) - { - sensitivity = abs(sensitivity); - } - VirtualControl* c = dev->GetVirtualControl(uid); - if (!c) - return -1; - // Add before deleting. Means I won't scroll up one line when scrolled down to bottom. - int controlIndex = c - dev->virtualControls; - int index = 0; - PadBindings* p = dev->pads[port][slot] + padtype; - p->bindings = (Binding*)realloc(p->bindings, (p->numBindings + 1) * sizeof(Binding)); - for (index = p->numBindings; index > 0; index--) - { - if (p->bindings[index - 1].controlIndex < controlIndex) - break; - p->bindings[index] = p->bindings[index - 1]; - } - Binding* b = p->bindings + index; - p->numBindings++; - b->command = command; - b->controlIndex = controlIndex; - b->rapidFire = rapidFire; - b->sensitivity = sensitivity; - b->deadZone = deadZone; - b->skipDeadZone = skipDeadZone; - // Where it appears in listview. - int count = ListBoundCommand(port, slot, dev, b); - - int newBindingIndex = index; - index = 0; - while (index < p->numBindings) - { - if (index == newBindingIndex) - { - index++; - continue; - } - b = p->bindings + index; - int nuke = 0; - if (config.multipleBinding) - { - if (b->controlIndex == controlIndex && b->command == command) - nuke = 1; - } - else - { - int uid2 = dev->virtualControls[b->controlIndex].uid; - if (b->controlIndex == controlIndex || (!((uid2 ^ uid) & 0xFFFFFF) && ((uid | uid2) & (UID_POV | UID_AXIS)))) - nuke = 1; - } - if (!nuke) - { - index++; - continue; - } - if (index < newBindingIndex) - { - newBindingIndex--; - count--; - } - DeleteBinding(port, slot, padtype, dev, b); - } - if (!config.multipleBinding) - { - for (int port2 = 0; port2 < 2; port2++) - { - for (int slot2 = 0; slot2 < 4; slot2++) - { - if (port2 == port && slot2 == slot) - continue; - int padtype2 = config.padConfigs[port2][slot2].type; - PadBindings* p = dev->pads[port2][slot2] + padtype2; - for (int i = 0; i < p->numBindings; i++) - { - Binding* b = p->bindings + i; - int uid2 = dev->virtualControls[b->controlIndex].uid; - if (b->controlIndex == controlIndex || (!((uid2 ^ uid) & 0xFFFFFF) && ((uid | uid2) & (UID_POV | UID_AXIS)))) - { - DeleteBinding(port2, slot2, padtype2, dev, b); - i--; - } - } - } - } - } - - return count; -} - -// Does nothing, but makes sure I'm overriding the dialog's window proc, to block -// default key handling. -ExtraWndProcResult DoNothingWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* output) -{ - return CONTINUE_BLISSFULLY; -} - -void EndBinding(HWND hWnd) -{ - if (selected) - { - KillTimer(hWnd, 1); - - int needRefreshDevices = 0; - // If binding ignore keyboard, this will disable it and enable other devices. - // 0xFF is used for testing force feedback. I disable all other devices first - // just so I don't needlessly steal the mouse. - if (selected == 0x7F || selected == 0xFF) - { - needRefreshDevices = 1; - } - selected = 0; - - quickSetup = false; - SetWindowTextW(GetDlgItem(hWnd, ID_QUICK_SETUP), L"Quick Setup"); - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), L""); - - dm->ReleaseInput(); - ClearKeyQueue(); - hWndButtonProc.Release(); - - // Safest to do this last. - if (needRefreshDevices) - { - RefreshEnabledDevices(); - } - } -} - - -INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM lParam) -{ - int index = (hWnd == PropSheet_IndexToHwnd(hWndProp, 1)); - int slot; - int port = GetPort(hWnd, &slot); - int padtype = config.padConfigs[port][slot].type; - HWND hWndList = GetDlgItem(hWnd, IDC_BINDINGS_LIST); - switch (msg) - { - case WM_INITDIALOG: - { - ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_DOUBLEBUFFER, LVS_EX_DOUBLEBUFFER); - LVCOLUMN c; - c.mask = LVCF_TEXT | LVCF_WIDTH; - c.cx = 90; - c.pszText = L"Device"; - ListView_InsertColumn(hWndList, 0, &c); - c.cx = 70; - c.pszText = L"PC Control"; - ListView_InsertColumn(hWndList, 1, &c); - c.pszText = L"PS2 Control"; - ListView_InsertColumn(hWndList, 2, &c); - selected = 0; - port = (int)((PROPSHEETPAGE*)lParam)->lParam & 1; - slot = (int)((PROPSHEETPAGE*)lParam)->lParam >> 1; - padtype = config.padConfigs[port][slot].type; - hWnds[port][slot][padtype] = hWnd; - SendMessage(hWndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); - SetupLogSlider(GetDlgItem(hWnd, IDC_SLIDER_SENSITIVITY)); - SetupLogSlider(GetDlgItem(hWnd, IDC_SLIDER_DEADZONE)); - SetupLogSlider(GetDlgItem(hWnd, IDC_SLIDER_SKIP_DEADZONE)); - CheckDlgButton(hWnd, IDC_CONFIGURE_ON_BIND, BST_CHECKED * config.configureOnBind); - - AddTooltip(IDC_BINDINGS_LIST, hWnd); - AddTooltip(IDC_DEVICE_SELECT, hWnd); - AddTooltip(IDC_CONFIGURE_ON_BIND, hWnd); - AddTooltip(ID_MOUSE, hWnd); - AddTooltip(ID_ANALOG, hWnd); - AddTooltip(ID_LOCK_ALL_INPUT, hWnd); - AddTooltip(ID_LOCK_DIRECTION, hWnd); - AddTooltip(ID_LOCK_BUTTONS, hWnd); - AddTooltip(ID_TURBO_KEY, hWnd); - AddTooltip(ID_EXCLUDE, hWnd); - AddTooltip(IDC_RAPID_FIRE, hWnd); - AddTooltip(IDC_FLIP, hWnd); - AddTooltip(IDC_SLIDER_DEADZONE, hWnd); - AddTooltip(IDC_SLIDER_SKIP_DEADZONE, hWnd); - AddTooltip(IDC_SLIDER_SENSITIVITY, hWnd); - - config.bind = false; - config.deviceSelect[port][slot] = -1; - HWND hWndDS = GetDlgItem(hWnds[port][slot][padtype], IDC_DEVICE_SELECT); - SendMessage(hWndDS, CB_RESETCONTENT, 0, 0); - int added = 0; - SendMessage(hWndDS, CB_INSERTSTRING, added, (LPARAM)L"Allow All Devices"); - SendMessage(hWndDS, CB_SETITEMDATA, added, -1); - added++; - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - if (dev->enabled && dev->api != IGNORE_KEYBOARD) - { - SendMessage(hWndDS, CB_INSERTSTRING, added, (LPARAM)dev->displayName); - SendMessage(hWndDS, CB_SETITEMDATA, added, i); - added++; - } - } - SendMessage(hWndDS, CB_SETCURSEL, 0, 0); - EnableWindow(hWndDS, added != 0); - - Populate(port, slot, padtype); - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - } - break; - case WM_DEVICECHANGE: - if (wParam == DBT_DEVNODES_CHANGED) - { - EndBinding(hWnd); - RefreshEnabledDevicesAndDisplay(1, hWndGeneral, 1); - } - break; - case WM_TIMER: - // ignore generic timer callback and handle the hwnd-specific one which comes later - if (hWnd == 0) - return 0; - - if (!selected || selected == 0xFF) - { - // !selected is mostly for device added/removed when binding. - selected = 0xFF; - EndBinding(hWnd); - } - else - { - unsigned int uid; - int value; - - // The old code re-bound our button hWndProcEater to GetDlgItem(hWnd, selected). But at best hWnd - // was null (WM_TIMER is passed twice, once with a null parameter, and a second time that is hWnd - // specific), and at worst 'selected' is a post-processed code "based" on cmd, so GetDlgItem - // *always* returned NULL anyway. This resulted in hWndButton being null, which meant Device code - // used hWnd instead. This may have caused odd behavior since the callbacks were still all eaten - // by the initial GetDlgItem(hWnd, cmd) selection made when the timer was initialized. - - InitInfo info = {selected == 0x7F, 1, hWndProp, &hWndButtonProc}; - Device* dev = dm->GetActiveDevice(&info, &uid, &index, &value); - static unsigned int prev_uid = !uid; - - if (dev == nullptr || (quickSetup && (uid == prev_uid || uid & UID_AXIS))) - return 0; - - //Check the bindings for an excluded input, and ignore it if found. - PadBindings* p_c = dev->pads[port][slot] + padtype; - for (int i = 0; i < p_c->numBindings; i++) - { - Binding* b2 = p_c->bindings + i; - int uid2 = dev->virtualControls[b2->controlIndex].uid; - if (b2->command == 0x29 && uid == uid2) - { - return 0; - } - } - - int command = selected; - // Good idea to do this first, as BindCommand modifies the ListView, which will - // call it anyways, which is a bit funky. - if (!quickSetup) - EndBinding(hWnd); - UnselectAll(hWndList); - int index = -1; - if (command < 0x30) - { - index = BindCommand(dev, uid, port, slot, padtype, command, BASE_SENSITIVITY, 0, 0, 0); - } - if (index >= 0) - { - PropSheet_Changed(hWndProp, hWnds[port][slot][padtype]); - ListView_SetItemState(hWndList, index, LVIS_SELECTED, LVIS_SELECTED); - ListView_EnsureVisible(hWndList, index, 0); - config.bind = true; - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - - if (quickSetup) - { - HWND hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x40F0); - for (selected++; selected <= (ID_ANALOG - (ID_SELECT - 0x10)); selected++) - { - HWND hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x40F0); - if (hWndS) - { - break; - } - } - if (!hWndS || selected > (ID_ANALOG - (ID_SELECT - 0x10))) - { - prev_uid = !uid; - EndBinding(hWnd); - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), L"Finished"); - } - else - { - wchar_t temp[60]; - wsprintfW(temp, L"Please enter an input for %ws", GetCommandStringW(selected, port, slot)); - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), temp); - Sleep(80); - for (int i = 0; i < dm->numDevices; i++) - { - if (dm->devices[i]->active && (dm->devices[i]->api != WM || dm->devices[i]->api != RAW)) - dm->devices[i]->Deactivate(); - } - prev_uid = uid; - } - } - else - { - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), L"Succeeded"); - } - } - } - break; - case WM_SYSKEYDOWN: - case WM_KEYDOWN: - EndBinding(hWnd); - break; - case PSM_CANCELTOCLOSE: - // Load(); - break; - case WM_ACTIVATE: - EndBinding(hWnd); - break; - case WM_NOTIFY: - { - PSHNOTIFY* n = (PSHNOTIFY*)lParam; - if (n->hdr.hwndFrom == hWndProp) - { - switch (n->hdr.code) - { - case PSN_QUERYCANCEL: - case PSN_KILLACTIVE: - EndBinding(hWnd); - return 0; - case PSN_SETACTIVE: - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), L""); - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - return 0; - case PSN_APPLY: - SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR); - return 1; - } - break; - } - else if (n->hdr.idFrom == IDC_BINDINGS_LIST) - { - static int NeedUpdate = 0; - if (n->hdr.code == LVN_KEYDOWN) - { - NMLVKEYDOWN* key = (NMLVKEYDOWN*)n; - if (key->wVKey == VK_DELETE || - key->wVKey == VK_BACK) - { - - if (DeleteSelected(port, slot)) - { - PropSheet_Changed(hWndProp, hWnds[0]); - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - } - } - } - // Update sensitivity and motor/binding display on redraw - // rather than on itemchanged. This reduces blinking, as - // I get 3 LVN_ITEMCHANGED messages, and first is sent before - // the new item is set as being selected. - else if (n->hdr.code == LVN_ITEMCHANGED) - { - NeedUpdate = 1; - } - else if (n->hdr.code == NM_CUSTOMDRAW && NeedUpdate) - { - NeedUpdate = 0; - SelChanged(port, slot); - } - if (n->hdr.code == NM_RCLICK) - { - HMENU hMenu = CreatePopupMenu(); - if (!hMenu) - break; - MENUITEMINFOW info; - wchar_t text[40]; - info.cbSize = sizeof(info); - info.fMask = MIIM_STRING | MIIM_ID; - info.dwTypeData = text; - info.wID = 1; - wsprintfW(text, L"Delete Selected"); - InsertMenuItemW(hMenu, 0, 1, &info); - info.wID = 2; - wsprintfW(text, L"Clear All"); - InsertMenuItemW(hMenu, 1, 1, &info); - POINT pos; - GetCursorPos(&pos); - short res = TrackPopupMenuEx(hMenu, TPM_NONOTIFY | TPM_RETURNCMD, pos.x, pos.y, hWndProp, 0); - DestroyMenu(hMenu); - if (res == 0) - break; - else if (res == 1) - { - if (DeleteSelected(port, slot)) - PropSheet_Changed(hWndProp, hWnd); - } - else if (res == 2) - { - while (DeleteByIndex(port, slot, 0)) - PropSheet_Changed(hWndProp, hWnd); - } - } - } - } - break; - case WM_HSCROLL: - { - int id = GetDlgCtrlID((HWND)lParam); - int val = GetLogSliderVal(hWnd, id); - if (id == IDC_SLIDER_SENSITIVITY) - { - ChangeValue(port, slot, &val, 0, 0, 0); - } - else if (id == IDC_SLIDER_DEADZONE) - { - ChangeValue(port, slot, 0, 0, &val, 0); - } - else if (id == IDC_SLIDER_SKIP_DEADZONE) - { - ChangeValue(port, slot, 0, 0, 0, &val); - } - else - { - ChangeEffect(port, slot, id, &val, 0); - } - } - break; - case WM_COMMAND: - if (HIWORD(wParam) == CBN_SELCHANGE && LOWORD(wParam) == IDC_AXIS_DIRECTION) - { - int index = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - if (index >= 0) - { - int cbsel = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); - if (cbsel >= 0) - { - ForceFeedbackBinding* ffb; - Binding* b; - Device* dev; - if (GetBinding(port, slot, index, dev, b, ffb)) - { - const static unsigned int axisUIDs[3] = {UID_AXIS_NEG, UID_AXIS_POS, UID_AXIS}; - int uid = dev->virtualControls[b->controlIndex].uid; - uid = (uid & 0x00FFFFFF) | axisUIDs[cbsel]; - Binding backup = *b; - DeleteSelected(port, slot); - int index = BindCommand(dev, uid, port, slot, padtype, backup.command, backup.sensitivity, backup.rapidFire, backup.deadZone, backup.skipDeadZone); - ListView_SetItemState(hWndList, index, LVIS_SELECTED, LVIS_SELECTED); - PropSheet_Changed(hWndProp, hWnd); - } - } - } - } - else if (HIWORD(wParam) == CBN_SELCHANGE && LOWORD(wParam) == IDC_DEVICE_SELECT) - { - int selectedDev = SendMessage(GetDlgItem(hWnd, IDC_DEVICE_SELECT), CB_GETCURSEL, 0, 0); - config.deviceSelect[port][slot] = SendMessage(GetDlgItem(hWnd, IDC_DEVICE_SELECT), CB_GETITEMDATA, selectedDev, 0); - RefreshEnabledDevicesAndDisplay(1, hWndGeneral, 1); - if (selectedDev > 0) - { - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[config.deviceSelect[port][slot]]; - if (dm->devices[i] != dev) - { - dm->DisableDevice(i); - } - else - { - dm->EnableDevice(i); - } - } - } - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - } - else if (HIWORD(wParam) == CBN_SELCHANGE && LOWORD(wParam) == IDC_FF_EFFECT) - { - int typeIndex = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); - if (typeIndex >= 0) - ChangeEffect(port, slot, 0, 0, (unsigned int*)&typeIndex); - } - else if (HIWORD(wParam) == BN_CLICKED) - { - int cmd = LOWORD(wParam); - if (quickSetup && cmd == ID_QUICK_SETUP) - { - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), L"Stopped"); - EndBinding(hWnd); - return 0; - } - EndBinding(hWnd); - if (cmd == ID_BIG_MOTOR || cmd == ID_SMALL_MOTOR) - { - int i = (int)SendMessage(GetDlgItem(hWnd, IDC_FORCEFEEDBACK), CB_GETCURSEL, 0, 0); - if (i >= 0) - { - unsigned int index = (unsigned int)SendMessage(GetDlgItem(hWnd, IDC_FORCEFEEDBACK), CB_GETITEMDATA, i, 0); - if (index < (unsigned int)dm->numDevices) - { - Device* dev = dm->devices[index]; - ForceFeedbackBinding* b; - wchar_t* effectID = 0; - if (dev->api == DI) - { - // Constant effect. - if (cmd == ID_BIG_MOTOR) - effectID = L"13541C20-8E33-11D0-9AD0-00A0C9A06E35"; - // Square. - else - effectID = L"13541C22-8E33-11D0-9AD0-00A0C9A06E35"; - } - int count = CreateEffectBinding(dev, effectID, port, slot, padtype, cmd - ID_BIG_MOTOR, &b); - if (b) - { - int needSet = 1; - if (dev->api == XINPUT && dev->numFFAxes == 2) - { - needSet = 0; - if (cmd == ID_BIG_MOTOR) - { - b->axes[0].force = BASE_SENSITIVITY; - } - else - { - b->axes[1].force = BASE_SENSITIVITY; - } - } - else if (dev->api == DS3 && dev->numFFAxes == 2) - { - needSet = 0; - if (cmd == ID_BIG_MOTOR) - { - b->axes[0].force = BASE_SENSITIVITY; - } - else - { - b->axes[1].force = BASE_SENSITIVITY; - } - } - else if (dev->api == DI) - { - int bigIndex = 0, littleIndex = 0; - int j; - for (j = 0; j < dev->numFFAxes; j++) - { - // DI object instance. 0 is x-axis, 1 is y-axis. - int instance = (dev->ffAxes[j].id >> 8) & 0xFFFF; - if (instance == 0) - { - bigIndex = j; - } - else if (instance == 1) - { - littleIndex = j; - } - } - needSet = 0; - if (cmd == ID_BIG_MOTOR) - { - b->axes[bigIndex].force = BASE_SENSITIVITY; - b->axes[littleIndex].force = 1; - } - else - { - b->axes[bigIndex].force = 1; - b->axes[littleIndex].force = BASE_SENSITIVITY; - } - } - if (needSet) - { - for (int j = 0; j < 2 && j < dev->numFFAxes; j++) - { - b->axes[j].force = BASE_SENSITIVITY; - } - } - UnselectAll(hWndList); - ListView_SetItemState(hWndList, count, LVIS_SELECTED, LVIS_SELECTED); - ListView_EnsureVisible(hWndList, count, 0); - } - PropSheet_Changed(hWndProp, hWnd); - } - } - } - else if (cmd == ID_CONTROLS) - { - UnselectAll(hWndList); - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), L""); - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - } - else if (cmd == ID_TEST) - { - // Just in case... - if (selected) - break; - int selIndex = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - if (selIndex >= 0) - { - Device* dev; - Binding* b; - ForceFeedbackBinding* ffb = 0; - if (GetBinding(port, slot, selIndex, dev, b, ffb)) - { - selected = 0xFF; - hWndButtonProc.SetWndHandle(GetDlgItem(hWnd, cmd)); - InitInfo info = {0, 1, hWndProp, &hWndButtonProc}; - for (int i = 0; i < dm->numDevices; i++) - { - if (dm->devices[i] != dev) - { - dm->DisableDevice(i); - } - } - dm->Update(&info); - dm->PostRead(); - dev->SetEffect(ffb, 255); - Sleep(200); - dm->Update(&info); - SetTimer(hWnd, 1, 3000, 0); - } - } - } - else if (cmd >= IDC_DPAD && cmd <= ID_QUICK_SETUP) - { // || cmd == ID_FORCE_FEEDBACK) { - // Messes up things, unfortunately. - // End binding on a bunch of notification messages, and - // this will send a bunch. - // UnselectAll(hWndList); - EndBinding(hWnd); - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), L""); - - RefreshEnabledDevices(0); - int selectedDev = SendMessage(GetDlgItem(hWnd, IDC_DEVICE_SELECT), CB_GETCURSEL, 0, 0); - if (selectedDev > 0) - { - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[config.deviceSelect[port][slot]]; - if (dm->devices[i] != dev) - { - dm->DisableDevice(i); - } - else - { - dm->EnableDevice(i); - } - } - } - - if (cmd != ID_QUICK_SETUP) - { - selected = cmd - (ID_SELECT - 0x10); - } - else - { - quickSetup = true; - HWND hWndS; - for (selected = 0x10; selected <= (ID_ANALOG - (ID_SELECT - 0x10)); selected++) - { - hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x40F0); - if (hWndS) - { - break; - } - } - if (hWndS) - { - SetWindowTextW(GetDlgItem(hWnd, ID_QUICK_SETUP), L"Stop"); - } - else - { - EndBinding(hWnd); - return 0; - } - } - wchar_t temp[60]; - wsprintfW(temp, L"Please enter an input for %ws", GetCommandStringW(selected, port, slot)); - SetWindowTextW(GetDlgItem(hWnd, IDC_QUICK_SETUP_TEXT), temp); - - hWndButtonProc.SetWndHandle(GetDlgItem(hWnd, cmd)); - hWndButtonProc.Eat(DoNothingWndProc, 0); - InitInfo info = {selected == 0x7F, 1, hWndProp, &hWndButtonProc}; - int w = timeGetTime(); - dm->Update(&info); - dm->PostRead(); - // Workaround for things that return 0 on first poll and something else ever after. - Sleep(80); - dm->Update(&info); - dm->PostRead(); - SetTimer(hWnd, 1, 30, 0); - } - else if (cmd == IDC_CONFIGURE_ON_BIND) - { - config.configureOnBind = IsDlgButtonChecked(hWnd, IDC_CONFIGURE_ON_BIND); - } - else if (cmd == ID_SPECIAL_INPUTS) - { - config.specialInputs[port][slot] = !config.specialInputs[port][slot]; - // FIXME: Fix DPI Scaling. Below code is commented out and a fixed size for inputs window is used to avoid DPI scaling issues. - // SetWindowPos(hWndList, NULL, 0, 0, 275, config.specialInputs[port][slot] ? 324 : 440, SWP_NOZORDER | SWP_NOMOVE); - // ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - // UnselectAll(hWndList); - SelChanged(port, slot); - } - if (cmd == IDC_RAPID_FIRE) - { - // Don't allow setting it back to indeterminate. - SendMessage(GetDlgItem(hWnd, IDC_RAPID_FIRE), BM_SETSTYLE, BS_AUTOCHECKBOX, 0); - int rapidFire = (IsDlgButtonChecked(hWnd, IDC_RAPID_FIRE) == BST_CHECKED); - ChangeValue(port, slot, 0, &rapidFire, 0, 0); - } - else if (cmd == IDC_FLIP) - { - int val = GetLogSliderVal(hWnd, IDC_SLIDER_SENSITIVITY); - ChangeValue(port, slot, &val, 0, 0, 0); - } - else if (cmd == ID_RESET_CONFIG) - { - // Just in case... - if (selected) - break; - int selIndex = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - if (selIndex >= 0) - { - Device* dev; - Binding* b; - ForceFeedbackBinding* ffb = 0; - if (GetBinding(port, slot, selIndex, dev, b, ffb)) - { - selected = 0xFF; - if (b) - { - VirtualControl* control = &dev->virtualControls[b->controlIndex]; - for (int i = IDC_SLIDER_SENSITIVITY; i <= IDC_SLIDER_SKIP_DEADZONE; i++) - { - if (i == IDC_SLIDER_SENSITIVITY) - { - int val = BASE_SENSITIVITY; - if (((control->uid >> 16) & 0xFF) == ABSAXIS) - { - val = BASE_ANALOG_SENSITIVITY; - } - ChangeValue(port, slot, &val, 0, 0, 0); - } - else if (i == IDC_SLIDER_DEADZONE) - { - int val = DEFAULT_DEADZONE; - if ((control->uid >> 16) & (PSHBTN | TGLBTN)) - { - val = 0; - } - else if ((control->uid >> 16) & PRESSURE_BTN) - { - val = 1; - } - ChangeValue(port, slot, 0, 0, &val, 0); - } - else if (i == IDC_SLIDER_SKIP_DEADZONE) - { - int val = 1; - if ((control->uid >> 16) & (PSHBTN | TGLBTN)) - { - val = 0; - } - ChangeValue(port, slot, 0, 0, 0, &val); - } - else if (i == IDC_RAPID_FIRE) - { - int val = 0; - ChangeValue(port, slot, 0, &val, 0, 0); - } - } - } - else if (ffb) - { - for (int i = IDC_FF_AXIS1; i <= IDC_FF_AXIS8; i += 0x10) - { - int val = BASE_SENSITIVITY; - if (ffb->motor != ((i - IDC_FF_AXIS1) / 0x10) || IsDlgButtonChecked(hWnd, i - 1) != BST_CHECKED) - { - val = 0; - } - ChangeEffect(port, slot, i, &val, 0); - } - } - } - } - } - else if (cmd >= IDC_FF_AXIS1_ENABLED && cmd < IDC_FF_AXIS8_ENABLED + 16) - { - int index = (cmd - IDC_FF_AXIS1_ENABLED) / 16; - int val = GetLogSliderVal(hWnd, 16 * index + IDC_FF_AXIS1); - if (IsDlgButtonChecked(hWnd, 16 * index + IDC_FF_AXIS1_ENABLED) != BST_CHECKED) - { - val = 0; - } - ChangeEffect(port, slot, cmd, &val, 0); - } - } - break; - default: - break; - } - return 0; -} - -// Returns 0 if pad doesn't exist due to mtap settings, as a convenience. -int GetPadString(wchar_t* string, unsigned int port, unsigned int slot) -{ - if (!slot && !config.multitap[port]) - { - wsprintfW(string, L"Pad %i", port + 1); - } - else - { - wsprintfW(string, L"Pad %i%c", port + 1, 'A' + slot); - if (!config.multitap[port]) - return 0; - } - return 1; -} - -// Returns 0 if pad doesn't exist due to mtap settings, as a convenience. -int GetPadTypeString(wchar_t* string, unsigned int port, unsigned int slot, unsigned int padtype) -{ - if (!slot && !config.multitap[port]) - { - wsprintfW(string, L"Pad %i, %s", port + 1, padTypes[padtype]); - } - else - { - wsprintfW(string, L"Pad %i%c, %s", port + 1, 'A' + slot, padTypes[padtype]); - if (!config.multitap[port]) - return 0; - } - return 1; -} - -bool ProfilesBindingCheck(unsigned int port, unsigned int slot, unsigned int padtype) -{ - bool showWarning = true; - int count = 0; - for (int i = 0; i < dm->numDevices; i++) - { - for (int portCheck = 0; portCheck < 2; portCheck++) - { - int maxslot = 1; - if (config.multitap[portCheck]) - maxslot = 4; - if (portCheck == port && !config.multitap[portCheck]) - continue; - for (int slotCheck = 0; slotCheck < maxslot; slotCheck++) - { - if (portCheck == port && slotCheck == slot) - continue; - int padtypeCheck = config.padConfigs[portCheck][slotCheck].type; - PadBindings* pCheck = dm->devices[i]->pads[portCheck][slotCheck] + padtypeCheck; - PadBindings* pActive = dm->devices[i]->pads[port][slot] + padtype; - for (int j = 0; j < pCheck->numBindings; j++) - { - for (int k = 0; k < pActive->numBindings; k++) - { - Binding* bCheck = pCheck->bindings + j; - Binding* bActive = pActive->bindings + k; - int uidCheck = dm->devices[i]->virtualControls[bCheck->controlIndex].uid; - int uidActive = dm->devices[i]->virtualControls[bActive->controlIndex].uid; - if (bCheck->controlIndex == bActive->controlIndex || (!((uidActive ^ uidCheck) & 0xFFFFFF) && ((uidCheck | uidActive) & (UID_POV | UID_AXIS)))) - { - if (showWarning) - { - int msgboxID = MessageBoxA(hWndProp, "Warning! You have selected a pad type that has one or several bindings that conflict with the active pad type of the opposing port or slot(s).\n\n" - "Do you want to keep the bindings of the pad type you are switching to?\n" - "Click \"Yes\" to continue without deleting any binding.\n" - "Click \"No\" to continue and delete any conflicting bindings from the selected pad type.\n" - "Click \"Cancel\" to revert to the previously selected pad type and avoid any further action.\n\n" - "Note: Enable the 'Allow binding multiple PS2 controls to one PC control' option to allow conflicting bindings between opposing ports and slots, and avoid this warning and the possibility of bindings getting deleted.", - "Duplicate Binding Warning", MB_YESNOCANCEL | MB_DEFBUTTON3 | MB_ICONWARNING); - switch (msgboxID) - { - case IDCANCEL: - return false; - break; - case IDYES: - return true; - break; - case IDNO: - showWarning = false; - break; - } - } - DeleteBinding(port, slot, padtype, dm->devices[i], bActive); - k--; - count++; - } - } - } - } - } - } - return true; -} - -void UpdatePadPages() -{ - HPROPSHEETPAGE pages[10]; - int count = 0; - memset(hWnds, 0, sizeof(hWnds)); - for (int port = 0; port < 2; port++) - { - for (int slot = 0; slot < 4; slot++) - { - if (config.padConfigs[port][slot].type == DisabledPad) - continue; - wchar_t title[20]; - if (!GetPadString(title, port, slot)) - continue; - - PROPSHEETPAGE psp; - ZeroMemory(&psp, sizeof(psp)); - psp.dwSize = sizeof(psp); - psp.dwFlags = PSP_USETITLE | PSP_PREMATURE; - psp.hInstance = GetModuleHandle(nullptr); - psp.pfnDlgProc = DialogProc; - psp.lParam = port | (slot << 1); - psp.pszTitle = title; - if (config.padConfigs[port][slot].type == GuitarPad) - psp.pszTemplate = MAKEINTRESOURCE(IDD_CONFIG_GUITAR); - else if (config.padConfigs[port][slot].type == PopnPad) - psp.pszTemplate = MAKEINTRESOURCE(IDD_CONFIG_POPN); - else if (config.padConfigs[port][slot].type == MousePad) - psp.pszTemplate = MAKEINTRESOURCE(IDD_CONFIG_PS1_MOUSE); - else if (config.padConfigs[port][slot].type == neGconPad) - psp.pszTemplate = MAKEINTRESOURCE(IDD_CONFIG_NEGCON); - else - psp.pszTemplate = MAKEINTRESOURCE(IDD_CONFIG); - - pages[count] = CreatePropertySheetPage(&psp); - if (pages[count]) - count++; - } - } - while (SendMessage(hWndProp, PSM_INDEXTOPAGE, 1, 0)) - { - PropSheet_RemovePage(hWndProp, 1, 0); - } - for (int i = 0; i < count; i++) - { - PropSheet_AddPage(hWndProp, pages[i]); - } -} - -int ListIndexToPortAndSlot(int index, int* port, int* slot) -{ - if (index < 0 || index >= 2 + 3 * (config.multitap[0] + config.multitap[1])) - { - *port = 0; - *slot = 0; - return 0; - } - if (index < 1 + 3 * config.multitap[0]) - { - *port = 0; - *slot = index; - } - else - { - *port = 1; - *slot = index - 1 - 3 * config.multitap[0]; - } - return 1; -} - -void UpdatePadList(HWND hWnd) -{ - static u8 recurse = 0; - if (recurse) - return; - recurse = 1; - HWND hWndList = GetDlgItem(hWnd, IDC_PAD_LIST); - HWND hWndCombo = GetDlgItem(hWnd, IDC_PAD_TYPE); - int slot; - int port; - int index = 0; - - for (port = 0; port < 2; port++) - { - for (slot = 0; slot < 4; slot++) - { - int padtype = config.padConfigs[port][slot].type; - wchar_t text[25]; - if (!GetPadString(text, port, slot)) - continue; - LVITEM item; - item.iItem = index; - item.iSubItem = 0; - item.mask = LVIF_TEXT; - item.pszText = text; - if (SendMessage(hWndList, LVM_GETITEMCOUNT, 0, 0) <= index) - { - ListView_InsertItem(hWndList, &item); - } - else - { - ListView_SetItem(hWndList, &item); - } - - item.iSubItem = 1; - if (numPadTypes - 1 < (unsigned int)padtype) - padtype = Dualshock2Pad; - wcsncpy(item.pszText, padTypes[padtype], 25); - //if (!slot && !config.padConfigs[port][slot].type) - // item.pszText = L"Unplugged (Kinda)"; - - ListView_SetItem(hWndList, &item); - - item.iSubItem = 2; - int count = 0; - int selectedDevice = config.deviceSelect[port][slot]; - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - if (!dev->enabled) - continue; - count += dev->pads[port][slot][padtype].numBindings + dev->pads[port][slot][padtype].numFFBindings; - } - wsprintf(text, L"%i", count); - item.pszText = text; - ListView_SetItem(hWndList, &item); - index++; - } - } - while (ListView_DeleteItem(hWndList, index)) - ; - int sel = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - - int enable; - if (!ListIndexToPortAndSlot(sel, &port, &slot)) - { - enable = 0; - SendMessage(hWndCombo, CB_SETCURSEL, -1, 0); - } - else - { - enable = 1; - SendMessage(hWndCombo, CB_SETCURSEL, config.padConfigs[port][slot].type, 0); - } - EnableWindow(hWndCombo, enable); - //ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_DOUBLEBUFFER|LVS_EX_ONECLICKACTIVATE, LVS_EX_DOUBLEBUFFER|LVS_EX_ONECLICKACTIVATE); - recurse = 0; -} - -INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM lParam) -{ - HWND hWndList = GetDlgItem(hWnd, IDC_PAD_LIST); - switch (msg) - { - case WM_INITDIALOG: - { - HWND hWndCombo = GetDlgItem(hWnd, IDC_PAD_TYPE); - if (SendMessage(hWndCombo, CB_GETCOUNT, 0, 0) == 0) - { - LVCOLUMN c; - c.mask = LVCF_TEXT | LVCF_WIDTH; - c.cx = 50; - c.pszText = L"Pad"; - ListView_InsertColumn(hWndList, 0, &c); - c.cx = 120; - c.pszText = L"Type"; - ListView_InsertColumn(hWndList, 1, &c); - c.pszText = L"Bindings"; - ListView_InsertColumn(hWndList, 2, &c); - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - selected = 0; - ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER); - SendMessage(hWndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); - for (int i = 0; i < numPadTypes; i++) - SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM)padTypes[i]); - } - } - UpdatePadPages(); - hWndGeneral = hWnd; - RefreshEnabledDevicesAndDisplay(0, hWnd, 0); - UpdatePadList(hWnd); - - if (!DualShock3Possible()) - { - config.gameApis.dualShock3 = 0; - EnableWindow(GetDlgItem(hWnd, IDC_G_DS3), 0); - } - - for (int j = 0; j < sizeof(BoolOptionsInfo) / sizeof(BoolOptionsInfo[0]); j++) - { - CheckDlgButton(hWnd, BoolOptionsInfo[j].ControlId, BST_CHECKED * config.bools[j]); - } - - AddTooltip(IDC_M_WM, hWnd); - AddTooltip(IDC_M_RAW, hWnd); - AddTooltip(IDC_MOUSE_UNFOCUS, hWnd); - AddTooltip(IDC_MULTIPLE_BINDING, hWnd); - AddTooltip(IDC_PAD_LIST, hWnd); - AddTooltip(IDC_PAD_TYPE, hWnd); - AddTooltip(IDC_DIAG_LIST, hWnd); - AddTooltip(IDC_G_DI, hWnd); - AddTooltip(IDC_G_XI, hWnd); - AddTooltip(ID_RESTORE_DEFAULTS, hWnd); - - if (config.keyboardApi < 0 || config.keyboardApi > 3) - config.keyboardApi = NO_API; - CheckRadioButton(hWnd, IDC_KB_DISABLE, IDC_KB_RAW, IDC_KB_DISABLE + config.keyboardApi); - if (config.mouseApi < 0 || config.mouseApi > 3) - config.mouseApi = NO_API; - CheckRadioButton(hWnd, IDC_M_DISABLE, IDC_M_RAW, IDC_M_DISABLE + config.mouseApi); - - break; - case WM_DEVICECHANGE: - if (wParam == DBT_DEVNODES_CHANGED) - { - RefreshEnabledDevicesAndDisplay(1, hWndGeneral, 1); - UpdatePadList(hWnd); - } - break; - case WM_COMMAND: - if (LOWORD(wParam) == IDC_PAD_TYPE) - { - if (HIWORD(wParam) == CBN_SELCHANGE) - { - HWND hWndCombo = GetDlgItem(hWnd, IDC_PAD_TYPE); - int index = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - int sel = SendMessage(hWndCombo, CB_GETCURSEL, 0, 0); - int port, slot; - if (sel < 0 || !ListIndexToPortAndSlot(index, &port, &slot)) - break; - if (sel != config.padConfigs[port][slot].type) - { - if (!config.multipleBinding && !ProfilesBindingCheck(port, slot, sel)) - break; - config.padConfigs[port][slot].type = (PadType)sel; - UpdatePadList(hWnd); - UpdatePadPages(); - RefreshEnabledDevicesAndDisplay(0, hWnd, 1); - PropSheet_Changed(hWndProp, hWnd); - } - } - } - else if (HIWORD(wParam) == BN_CLICKED && (LOWORD(wParam) == ID_LOAD || LOWORD(wParam) == ID_SAVE)) - { - OPENFILENAMEW ofn; - memset(&ofn, 0, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = hWnd; - ofn.lpstrFilter = L"PAD Config Files\0*.pad\0All Files\0*.*\0\0"; - wchar_t file[MAX_PATH + 1]; - ofn.lpstrFile = file; - ofn.nMaxFile = MAX_PATH; - wcscpy(file, config.lastSaveConfigFileName); - ofn.lpstrInitialDir = config.lastSaveConfigPath; - ofn.Flags = OFN_DONTADDTORECENT | OFN_LONGNAMES | OFN_NOCHANGEDIR; - ofn.lpstrDefExt = L"pad"; - if (LOWORD(wParam) == ID_LOAD) - { - ofn.lpstrTitle = L"Load PAD Configuration"; - ofn.Flags |= OFN_FILEMUSTEXIST; - if (GetOpenFileNameW(&ofn)) - { - LoadSettings(1, ofn.lpstrFile); - GeneralDialogProc(hWnd, WM_INITDIALOG, 0, 0); - PropSheet_Changed(hWndProp, hWnd); - } - } - else - { - ofn.lpstrTitle = L"Save PAD Configuration"; - ofn.Flags |= OFN_OVERWRITEPROMPT; - if (GetSaveFileNameW(&ofn)) - { - if (SaveSettings(ofn.lpstrFile) == -1) - { - MessageBox(hWnd, L"Save fail", L"Couldn't save file.", MB_OK); - } - } - } - break; - } - else if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == ID_RESTORE_DEFAULTS) - { - int msgboxID = MessageBoxA(hWndProp, "This will delete all current settings and revert back to the default settings of PAD. Continue?", - "Restore Defaults Confirmation", MB_YESNO | MB_DEFBUTTON2 | MB_ICONEXCLAMATION); - switch (msgboxID) - { - case IDNO: - break; - case IDYES: - char iniLocation[MAX_PATH * 2] = "inis/PAD.ini"; - remove(iniLocation); - createIniDir = true; - LoadSettings(1); - GeneralDialogProc(hWnd, WM_INITDIALOG, 0, 0); - PropSheet_Changed(hWndProp, hWnd); - break; - } - } - else - { - - int mtap = config.multitap[0] + 2 * config.multitap[1]; - - for (int j = 0; j < sizeof(BoolOptionsInfo) / sizeof(BoolOptionsInfo[0]); j++) - { - config.bools[j] = (IsDlgButtonChecked(hWnd, BoolOptionsInfo[j].ControlId) == BST_CHECKED); - } - - for (int i = 0; i < 4; i++) - { - if (i && IsDlgButtonChecked(hWnd, IDC_KB_DISABLE + i) == BST_CHECKED) - { - config.keyboardApi = (DeviceAPI)i; - } - if (IsDlgButtonChecked(hWnd, IDC_M_DISABLE + i) == BST_CHECKED) - { - config.mouseApi = (DeviceAPI)i; - } - } - - if (mtap != config.multitap[0] + 2 * config.multitap[1]) - { - UpdatePadPages(); - } - RefreshEnabledDevicesAndDisplay(0, hWnd, 1); - UpdatePadList(hWnd); - - PropSheet_Changed(hWndProp, hWnd); - - if (mtap != config.multitap[0] + 2 * config.multitap[1]) - { - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - } - } - break; - case WM_NOTIFY: - { - PSHNOTIFY* n = (PSHNOTIFY*)lParam; - if (n->hdr.hwndFrom == hWndProp) - { - switch (n->hdr.code) - { - case PSN_QUERYCANCEL: - case PSN_KILLACTIVE: - EndBinding(hWnd); - return 0; - case PSN_SETACTIVE: - //selected = 0; - UpdatePadList(hWnd); - return 0; - case PSN_APPLY: - selected = 0; - if (SaveSettings()) - { - SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); - return 0; - } - SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR); - return 1; - } - } - else if (n->hdr.idFrom == IDC_DIAG_LIST) - { - if (n->hdr.code == NM_DBLCLK) - { - Diagnostics(hWnd); - } - else if (n->hdr.code == NM_RCLICK) - { - HMENU hMenu = CreatePopupMenu(); - if (!hMenu) - break; - MENUITEMINFOW info; - wchar_t text[40]; - info.cbSize = sizeof(info); - info.fMask = MIIM_STRING | MIIM_ID; - info.dwTypeData = text; - info.wID = 1; - wsprintfW(text, L"Test Device"); - InsertMenuItemW(hMenu, 0, 1, &info); - info.wID = 2; - wsprintfW(text, L"Refresh"); - InsertMenuItemW(hMenu, 1, 1, &info); - POINT pos; - GetCursorPos(&pos); - short res = TrackPopupMenuEx(hMenu, TPM_NONOTIFY | TPM_RETURNCMD, pos.x, pos.y, hWndProp, 0); - DestroyMenu(hMenu); - if (res == 0) - break; - else if (res == 1) - { - Diagnostics(hWnd); - RefreshEnabledDevices(); - } - else if (res == 2) - { - RefreshEnabledDevicesAndDisplay(1, hWnd, 1); - UpdatePadList(hWnd); - } - } - } - else if (n->hdr.idFrom == IDC_PAD_LIST) - { - if (n->hdr.code == LVN_ITEMCHANGED) - { - UpdatePadList(hWnd); - } - if (n->hdr.code == NM_DBLCLK) - { - UpdatePadList(hWnd); - int index = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - PropSheet_SetCurSel(hWndProp, 0, index + 1); - } - else if (n->hdr.code == NM_RCLICK) - { - UpdatePadList(hWnd); - int index = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - int port1, slot1, port2, slot2, padtype1, padtype2; - if (!ListIndexToPortAndSlot(index, &port1, &slot1)) - break; - padtype1 = config.padConfigs[port1][slot1].type; - HMENU hMenu = CreatePopupMenu(); - if (!hMenu) - break; - MENUITEMINFOW info; - for (int IndividualPadtypes = 1; IndividualPadtypes >= 0; IndividualPadtypes--) - { - info.fMask = MIIM_TYPE; - info.fType = MFT_SEPARATOR; - InsertMenuItemW(hMenu, 0, 1, &info); - for (port2 = 1; port2 >= 0; port2--) - { - for (slot2 = 3; slot2 >= 0; slot2--) - { - padtype2 = config.padConfigs[port2][slot2].type; - wchar_t text[60]; - wchar_t pad[40]; - if (IndividualPadtypes == 0) - { - if (!GetPadString(pad, port2, slot2)) - continue; - } - else - { - if (!GetPadTypeString(pad, port2, slot2, padtype2)) - continue; - } - info.cbSize = sizeof(info); - info.fMask = MIIM_STRING | MIIM_ID; - info.dwTypeData = text; - if (port2 == port1 && slot2 == slot1 && padtype2 == padtype1) - { - int index = GetMenuItemCount(hMenu); - wsprintfW(text, L"Clear %s Bindings", pad); - if (IndividualPadtypes == 0) - { - info.wID = -1; - wsprintfW(text, L"Clear all %s Bindings", pad); - } - else - { - info.wID = -2; - wsprintfW(text, L"Clear %s Bindings only", pad); - } - InsertMenuItemW(hMenu, index, 1, &info); - info.fMask = MIIM_TYPE; - info.fType = MFT_SEPARATOR; - InsertMenuItemW(hMenu, index, 1, &info); - } - else if (!(port2 == port1 && slot2 == slot1)) - { - info.wID = port2 + 2 * slot2 + 1; - if (IndividualPadtypes == 1) - { - if (!config.multipleBinding && padtype2 != padtype1) - continue; - info.wID += 8; - wsprintfW(text, L"Swap with %s bindings only", pad); - } - else - { - wsprintfW(text, L"Swap all bindings with %s", pad); - } - InsertMenuItemW(hMenu, 0, 1, &info); - } - } - } - } - POINT pos; - GetCursorPos(&pos); - short res = TrackPopupMenuEx(hMenu, TPM_NONOTIFY | TPM_RETURNCMD, pos.x, pos.y, hWndProp, 0); - DestroyMenu(hMenu); - if (!res) - break; - bool swapIndividualPadtypes = false; - if (res > 0) - { - if (res > 8) - { - res -= 8; - swapIndividualPadtypes = true; - } - res--; - slot2 = res / 2; - port2 = res & 1; - padtype2 = config.padConfigs[port2][slot2].type; - PadConfig padCfgTemp = config.padConfigs[port1][slot1]; - config.padConfigs[port1][slot1] = config.padConfigs[port2][slot2]; - config.padConfigs[port2][slot2] = padCfgTemp; - if (swapIndividualPadtypes) - { - config.padConfigs[port2][slot2].type = config.padConfigs[port1][slot1].type; - config.padConfigs[port1][slot1].type = padCfgTemp.type; - } - for (int i = 0; i < dm->numDevices; i++) - { - if (dm->devices[i]->type == IGNORE) - continue; - if (swapIndividualPadtypes) - { - PadBindings bindings = dm->devices[i]->pads[port1][slot1][padtype1]; - dm->devices[i]->pads[port1][slot1][padtype1] = dm->devices[i]->pads[port2][slot2][padtype2]; - dm->devices[i]->pads[port2][slot2][padtype2] = bindings; - } - else - { - for (int padtype = 0; padtype < numPadTypes; padtype++) - { - PadBindings bindings = dm->devices[i]->pads[port1][slot1][padtype]; - dm->devices[i]->pads[port1][slot1][padtype] = dm->devices[i]->pads[port2][slot2][padtype]; - dm->devices[i]->pads[port2][slot2][padtype] = bindings; - } - } - } - } - else - { - if (res == -2) - { - swapIndividualPadtypes = true; - } - for (int i = 0; i < dm->numDevices; i++) - { - if (dm->devices[i]->type == IGNORE) - continue; - if (swapIndividualPadtypes) - { - free(dm->devices[i]->pads[port1][slot1][padtype1].bindings); - for (int j = 0; j < dm->devices[i]->pads[port1][slot1][padtype1].numFFBindings; j++) - { - free(dm->devices[i]->pads[port1][slot1][padtype1].ffBindings[j].axes); - } - free(dm->devices[i]->pads[port1][slot1][padtype1].ffBindings); - memset(&dm->devices[i]->pads[port1][slot1][padtype1], 0, sizeof(dm->devices[i]->pads[port1][slot1][padtype1])); - } - else - { - for (int padtype = 0; padtype < numPadTypes; padtype++) - { - free(dm->devices[i]->pads[port1][slot1][padtype].bindings); - for (int j = 0; j < dm->devices[i]->pads[port1][slot1][padtype].numFFBindings; j++) - { - free(dm->devices[i]->pads[port1][slot1][padtype].ffBindings[j].axes); - } - free(dm->devices[i]->pads[port1][slot1][padtype].ffBindings); - memset(&dm->devices[i]->pads[port1][slot1][padtype], 0, sizeof(dm->devices[i]->pads[port1][slot1][padtype])); - } - } - } - } - UpdatePadPages(); - UpdatePadList(hWnd); - PropSheet_Changed(hWndProp, hWnd); - } - } - } - break; - default: - break; - } - return 0; -} - -int CALLBACK PropSheetProc(HWND hWnd, UINT msg, LPARAM lParam) -{ - if (hWnd) - hWndProp = hWnd; - return 0; -} - -void Configure() -{ - // Can end up here without PADinit() being called first. - LoadSettings(); - // Can also end up here after running emulator a bit, and possibly - // disabling some devices due to focus changes, or releasing mouse. - RefreshEnabledDevices(0); - - memset(hWnds, 0, sizeof(hWnds)); - - PROPSHEETPAGE psp; - ZeroMemory(&psp, sizeof(psp)); - psp.dwSize = sizeof(psp); - psp.dwFlags = PSP_USETITLE | PSP_PREMATURE; - psp.hInstance = GetModuleHandle(nullptr); - psp.pfnDlgProc = GeneralDialogProc; - psp.pszTitle = L"General"; - psp.pszTemplate = MAKEINTRESOURCE(IDD_GENERAL); - HPROPSHEETPAGE page = CreatePropertySheetPage(&psp); - if (!page) - return; - - PROPSHEETHEADER psh; - ZeroMemory(&psh, sizeof(psh)); - psh.dwFlags = PSH_DEFAULT | PSH_USECALLBACK | PSH_NOCONTEXTHELP; - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.pfnCallback = PropSheetProc; - psh.hwndParent = GetActiveWindow(); - psh.nPages = 1; - psh.phpage = &page; - wchar_t title[200]; - GetNameAndVersionString(title); - wcscat(title, L" Settings"); - psh.pszCaption = title; - PropertySheet(&psh); - LoadSettings(1); - memset(hWnds, 0, sizeof(hWnds)); -} - -void UnloadConfigs() -{ - if (dm) - { - delete dm; - dm = 0; - } -} diff --git a/pcsx2/PAD/Windows/PADConfig.h b/pcsx2/PAD/Windows/PADConfig.h deleted file mode 100644 index c5e3a59f31..0000000000 --- a/pcsx2/PAD/Windows/PADConfig.h +++ /dev/null @@ -1,80 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef CONFIG_H -#define CONFIG_H - -extern const wchar_t* padTypes[numPadTypes]; - -struct PadConfig -{ - PadType type; -}; - -struct GeneralConfig -{ -public: - PadConfig padConfigs[2][4]; - - int deviceSelect[2][4]; - - DeviceAPI keyboardApi; - DeviceAPI mouseApi; - - // Derived value, calculated by GetInput(). - u8 configureOnBind; - bool bind; - - bool specialInputs[2][4]; - - union - { - struct - { - u8 mouseUnfocus; - u8 background; - u8 multipleBinding; - - struct - { - u8 directInput; - u8 xInput; - u8 dualShock3; - } gameApis; - - u8 multitap[2]; - - u8 debug; - - u8 GH2; - }; - u8 bools[15]; - }; - - wchar_t lastSaveConfigPath[MAX_PATH + 1]; - wchar_t lastSaveConfigFileName[MAX_PATH + 1]; -}; - -extern GeneralConfig config; - -void UnloadConfigs(); - -int LoadSettings(int force = 0, wchar_t* file = 0); - -// Refreshes the set of enabled devices. -void RefreshEnabledDevices(int updateDeviceList = 0); - -void Configure(); -#endif diff --git a/pcsx2/PAD/Windows/PADRawInput.cpp b/pcsx2/PAD/Windows/PADRawInput.cpp deleted file mode 100644 index 62a57d100e..0000000000 --- a/pcsx2/PAD/Windows/PADRawInput.cpp +++ /dev/null @@ -1,367 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "InputManager.h" -#include "WindowsMessaging.h" -#include "VKey.h" -#include "DeviceEnumerator.h" -#include "WndProcEater.h" -#include "WindowsKeyboard.h" -#include "WindowsMouse.h" - -ExtraWndProcResult RawInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* output); - -int GetRawKeyboards(HWND hWnd) -{ - RAWINPUTDEVICE Rid; - Rid.hwndTarget = hWnd; - - Rid.dwFlags = 0; - Rid.usUsagePage = 0x01; - Rid.usUsage = 0x06; - return RegisterRawInputDevices(&Rid, 1, sizeof(Rid)); -} - -void ReleaseRawKeyboards() -{ - RAWINPUTDEVICE Rid; - Rid.hwndTarget = 0; - - Rid.dwFlags = RIDEV_REMOVE; - Rid.usUsagePage = 0x01; - Rid.usUsage = 0x06; - RegisterRawInputDevices(&Rid, 1, sizeof(Rid)); -} - -int GetRawMice(HWND hWnd) -{ - RAWINPUTDEVICE Rid; - Rid.hwndTarget = hWnd; - - Rid.dwFlags = RIDEV_NOLEGACY | RIDEV_CAPTUREMOUSE; - Rid.usUsagePage = 0x01; - Rid.usUsage = 0x02; - return RegisterRawInputDevices(&Rid, 1, sizeof(Rid)); -} - -void ReleaseRawMice() -{ - RAWINPUTDEVICE Rid; - Rid.hwndTarget = 0; - - Rid.dwFlags = RIDEV_REMOVE; - Rid.usUsagePage = 0x01; - Rid.usUsage = 0x02; - RegisterRawInputDevices(&Rid, 1, sizeof(Rid)); -} - -// Count of active raw keyboard devices. -// when it gets to 0, release them all. -static int rawKeyboardActivatedCount = 0; -// Same for mice. -static int rawMouseActivatedCount = 0; - -class RawInputKeyboard : public WindowsKeyboard -{ -public: - HANDLE hDevice; - - RawInputKeyboard(HANDLE hDevice, wchar_t* name, wchar_t* instanceID = 0) - : WindowsKeyboard(RAW, name, instanceID) - { - this->hDevice = hDevice; - } - - int Activate(InitInfo* initInfo) - { - Deactivate(); - - hWndProc = initInfo->hWndProc; - - active = 1; - if (!rawKeyboardActivatedCount++) - { - if (!rawMouseActivatedCount) - hWndProc->Eat(RawInputWndProc, EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES); - - if (!GetRawKeyboards(hWndProc->hWndEaten)) - { - Deactivate(); - return 0; - } - } - - InitState(); - return 1; - } - - void Deactivate() - { - FreeState(); - if (active) - { - active = 0; - rawKeyboardActivatedCount--; - if (!rawKeyboardActivatedCount) - { - ReleaseRawKeyboards(); - if (!rawMouseActivatedCount) - hWndProc->ReleaseExtraProc(RawInputWndProc); - } - } - } -}; - -class RawInputMouse : public WindowsMouse -{ -public: - HANDLE hDevice; - - RawInputMouse(HANDLE hDevice, wchar_t* name, wchar_t* instanceID = 0, wchar_t* productID = 0) - : WindowsMouse(RAW, 0, name, instanceID, productID) - { - this->hDevice = hDevice; - } - - int Activate(InitInfo* initInfo) - { - Deactivate(); - - hWndProc = initInfo->hWndProc; - - active = 1; - - // Have to be careful with order. At worst, one unmatched call to ReleaseRawMice on - // EatWndProc fail. In all other cases, no unmatched initialization/cleanup - // lines. - if (!rawMouseActivatedCount++) - { - GetMouseCapture(hWndProc->hWndEaten); - if (!rawKeyboardActivatedCount) - hWndProc->Eat(RawInputWndProc, EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES); - - if (!GetRawMice(hWndProc->hWndEaten)) - { - Deactivate(); - return 0; - } - } - - AllocState(); - return 1; - } - - void Deactivate() - { - FreeState(); - if (active) - { - active = 0; - rawMouseActivatedCount--; - if (!rawMouseActivatedCount) - { - ReleaseRawMice(); - ReleaseMouseCapture(); - if (!rawKeyboardActivatedCount) - { - hWndProc->ReleaseExtraProc(RawInputWndProc); - } - } - } - } -}; - -ExtraWndProcResult RawInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* output) -{ - if (uMsg == WM_INPUT) - { - if (GET_RAWINPUT_CODE_WPARAM(wParam) == RIM_INPUT) - { - RAWINPUT in; - unsigned int size = sizeof(RAWINPUT); - if (GetRawInputData((HRAWINPUT)lParam, RID_INPUT, &in, &size, sizeof(RAWINPUTHEADER)) > 0) - { - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - if (dev->api != RAW || !dev->active) - continue; - if (in.header.dwType == RIM_TYPEKEYBOARD && dev->type == KEYBOARD) - { - RawInputKeyboard* rik = (RawInputKeyboard*)dev; - if (rik->hDevice != in.header.hDevice) - continue; - - u32 uMsg = in.data.keyboard.Message; - if (!(in.data.keyboard.VKey >> 8)) - rik->UpdateKey((u8)in.data.keyboard.VKey, (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN)); - } - else if (in.header.dwType == RIM_TYPEMOUSE && dev->type == MOUSE) - { - RawInputMouse* rim = (RawInputMouse*)dev; - if (rim->hDevice != in.header.hDevice) - continue; - if (in.data.mouse.usFlags) - { - // Never been set for me, and specs on what most of them - // actually mean is sorely lacking. Also, specs erroneously - // indicate MOUSE_MOVE_RELATIVE is a flag, when it's really - // 0... - continue; - } - - unsigned short buttons = in.data.mouse.usButtonFlags & 0x3FF; - int button = 0; - while (buttons) - { - if (buttons & 3) - { - // 2 is up, 1 is down. Up takes precedence over down. - rim->UpdateButton(button, !(buttons & 2)); - } - button++; - buttons >>= 2; - } - if (in.data.mouse.usButtonFlags & RI_MOUSE_WHEEL) - { - rim->UpdateAxis(2, ((short)in.data.mouse.usButtonData) / WHEEL_DELTA); - } - if (in.data.mouse.lLastX || in.data.mouse.lLastY) - { - rim->UpdateAxis(0, in.data.mouse.lLastX); - rim->UpdateAxis(1, in.data.mouse.lLastY); - } - } - } - } - } - } - else if (uMsg == WM_ACTIVATE) - { - for (int i = 0; i < dm->numDevices; i++) - { - Device* dev = dm->devices[i]; - if (dev->api != RAW || dev->physicalControlState == 0) - continue; - memset(dev->physicalControlState, 0, sizeof(int) * dev->numPhysicalControls); - } - } - else if (uMsg == WM_SIZE && rawMouseActivatedCount) - { - // Doesn't really matter for raw mice, as I disable legacy stuff, but shouldn't hurt. - WindowsMouse::WindowResized(hWnd); - } - - return CONTINUE_BLISSFULLY; -} - -void EnumRawInputDevices() -{ - int count = 0; - if (GetRawInputDeviceList(0, (unsigned int*)&count, sizeof(RAWINPUTDEVICELIST)) != (UINT)-1 && count > 0) - { - wchar_t* instanceID = (wchar_t*)malloc(41000 * sizeof(wchar_t)); - wchar_t* keyName = instanceID + 11000; - wchar_t* displayName = keyName + 10000; - wchar_t* productID = displayName + 10000; - - RAWINPUTDEVICELIST* list = (RAWINPUTDEVICELIST*)malloc(sizeof(RAWINPUTDEVICELIST) * count); - count = GetRawInputDeviceList(list, (unsigned int*)&count, sizeof(RAWINPUTDEVICELIST)); - - // Not necessary, but reminder that count is -1 on failure. - if (count > 0) - { - int keyboardCount = 1; - int mouseCount = 1; - for (int i = 0; i < count; i++) - { - if (list[i].dwType != RIM_TYPEKEYBOARD && list[i].dwType != RIM_TYPEMOUSE) - continue; - - UINT bufferLen = 10000; - int nameLen = GetRawInputDeviceInfo(list[i].hDevice, RIDI_DEVICENAME, instanceID, &bufferLen); - if (nameLen >= 4) - { - // nameLen includes terminating null. - nameLen--; - - // Strip out GUID parts of instanceID to make it a generic product id, - // and reformat it to point to registry entry containing device description. - wcscpy(productID, instanceID); - wchar_t* temp = 0; - for (int j = 0; j < 3; j++) - { - wchar_t* s = wcschr(productID, '#'); - if (!s) - break; - *s = '\\'; - if (j == 2) - { - *s = 0; - } - if (j == 1) - temp = s; - } - - wsprintfW(keyName, L"SYSTEM\\CurrentControlSet\\Enum%s", productID + 3); - if (temp) - *temp = 0; - int haveDescription = 0; - HKEY hKey; - if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName, 0, KEY_QUERY_VALUE, &hKey)) - { - DWORD type; - DWORD len = 10000 * sizeof(wchar_t); - if (ERROR_SUCCESS == RegQueryValueExW(hKey, L"DeviceDesc", 0, &type, (BYTE*)displayName, &len) && - len && type == REG_SZ) - { - wchar_t* temp2 = wcsrchr(displayName, ';'); - if (!temp2) - temp2 = displayName; - else - temp2++; - // Could do without this, but more effort than it's worth. - wcscpy(keyName, temp2); - haveDescription = 1; - } - RegCloseKey(hKey); - } - if (list[i].dwType == RIM_TYPEKEYBOARD) - { - if (!haveDescription) - wsprintfW(displayName, L"Raw Keyboard %i", keyboardCount++); - else - wsprintfW(displayName, L"Raw KB: %s", keyName); - dm->AddDevice(new RawInputKeyboard(list[i].hDevice, displayName, instanceID)); - } - else if (list[i].dwType == RIM_TYPEMOUSE) - { - if (!haveDescription) - wsprintfW(displayName, L"Raw Mouse %i", mouseCount++); - else - wsprintfW(displayName, L"Raw MS: %s", keyName); - dm->AddDevice(new RawInputMouse(list[i].hDevice, displayName, instanceID, productID)); - } - } - } - } - free(list); - free(instanceID); - dm->AddDevice(new RawInputKeyboard(0, L"Simulated Keyboard")); - dm->AddDevice(new RawInputMouse(0, L"Simulated Mouse")); - } -} diff --git a/pcsx2/PAD/Windows/PADRawInput.h b/pcsx2/PAD/Windows/PADRawInput.h deleted file mode 100644 index 4d325c18ef..0000000000 --- a/pcsx2/PAD/Windows/PADRawInput.h +++ /dev/null @@ -1,18 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -// Can't enumerate raw devices, can only detect them when -// receiving data from them, so just use the list from before. -void EnumRawInputDevices(); diff --git a/pcsx2/PAD/Windows/Tooltips.cpp b/pcsx2/PAD/Windows/Tooltips.cpp deleted file mode 100644 index 27c13c89ea..0000000000 --- a/pcsx2/PAD/Windows/Tooltips.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "resource_pad.h" - -LPWSTR pad_dialog_message(int ID, bool* updateText) -{ - if (updateText) - *updateText = true; - switch (ID) - { - // General tab - case IDC_M_WM: - case IDC_M_RAW: - return L"Enables mouse inputs to be used as pad controls.\n\n" - L"The mouse needs to be in focus to be used for playing. By default this is not the case as the \"Start without mouse focus\" checkbox is enabled. " - L"Either disable this checkbox or enable/disable the mouse while playing by assigning a key to the \"Mouse\" button on the Pad tabs.\n\n" - L"Note 1: By default PCSX2 uses a double-click by the left mouse button to toggle fullscreen mode, this makes the left mouse button unusable as an input." - L"To disable this option in PCSX2 go to Config > Emulation Settings > GS Window tab, and disable the \"Double-click toggles fullscreen mode\" checkbox.\n\n" - L"Note 2: This does not enable the mouse to function as an in-game mouse in PS2 games that support a USB mouse or lightgun." - L"This requires a USB device."; - case IDC_MOUSE_UNFOCUS: - return L"Enabled: Mouse is unfocused and can be used for emulation and outside it.\n\n" - L"Disabled: Mouse is focused and can be used for emulation."; - case IDC_MULTIPLE_BINDING: - return L"Allows binding multiple PS2 controls to one PC control, and binding conflicting controls on opposing ports and/or slots.\n\n" - L"Also enables swapping different kinds of pad types(for example, between DS2 and Guitar) when right-clicking in the pad list."; - case IDC_PAD_LIST: - return L"Left-click on one of the available pads to enable the pad specific options on the right." - L"These options include being able to select the pad type(DS2, Guitar, etc.) and enabling automatic analog mode for PS1 emulation.\n\n" - L"Right-click to show a pop-up menu that allows for swapping all the settings and bindings, or just the bindings of individual pad types," - L"between the selected pad and one of other active pads, and clearing all the settings and bindings from the selected pad or just the bindings from a selected pad type.\n\n" - L"Note: To allow swapping different kinds of pad types(like DS2 to Guitar), the \"Allow binding multiple PS2 Controls...\" option needs to be enabled as well."; - case IDC_PAD_TYPE: - return L"\"Unplugged\" disables the controller and removes the corresponding pad tab.\n\n" - L"\"Dualshock 2\" emulates the default PS2 controller for use in both PS1 and PS2 games.\n\n" - L"\"Guitar\" emulates a PS2 controller used in the Guitar Hero and Rock Band series of games.\n\n" - L"\"Pop'n Music controller\" emulates a PS2 controller used exclusively in the Japanese Pop'n Music series of games.\n\n" - L"\"PS1 Mouse\" emulates the PlayStation Mouse. This controller can only be used in a number of PS1 games like \"Command & Conquer: Red Alert\" and \"Myst\".\n\n" - L"\"neGcon\" emulates a controller that can be used in a number of PS1 games and PS2 games like the \"Ridge Racer\" and \"Ace Combat\" series."; - case IDC_DIAG_LIST: - return L"Shows a list of currently available input devices.\n\n" - L"Double-click a device in the list or right-click it and select \"Test Device\" to display a continuously updated list of the state of all inputs on the selected device.\n" - L"Use this option to check if all the inputs on a controller function properly.\n\n" - L"Right-click and select \"Refresh\" to update the list of devices in case a recently connected device has not shown up yet."; - case IDC_G_DI: - return L"(Legacy) Enable this if your gamepad doesn't support Xinput.\n\n" - L"Disable for DualShock 4 (PS4 controllers) and probably others."; - case IDC_G_XI: - return L"For Xbox 360/ Xbox One controllers (or devices supporting Xinput).\n\n" - L"If it doesn't support Xinput then running through Steam as a non-Steam game might be required for the controllers to work properly.\n\n" - L"https://gamepad-tester.com/ to test your controller and check if it only says 'Xinput' on top."; - case ID_RESTORE_DEFAULTS: - return L"Restores the default contents of PAD.ini, undoing all settings changes and bindings that have been set up."; - // Pad tabs - case IDC_BINDINGS_LIST: - return L"Shows a list of currently bound inputs of the selected Pad.\n\n" - L"Left-click on one of the bindings in the list to configure it.\n\n" - L"Right-click and select \"Delete Selected\" to remove the selected input from the list.\n\n" - L"Right-click and select \"Clear All\" to remove all the inputs from the list.\n\n" - L"Note: Use Shift/Ctrl + Left-click to select multiple bindings. Changing the displayed configuration will now copy it to all selected bindings."; - case IDC_DEVICE_SELECT: - return L"Select a single device to hide the bindings from other devices in the bindings list, and to only be able to add new bindings for the selected device.\n\n" - L"This can also avoid input conflict issues when one controller is recognized as several devices through different APIs."; - case IDC_CONFIGURE_ON_BIND: - return L"Immediately go to the configuration setup when you create a new binding."; - case ID_MOUSE: - return L"Bind a key that releases or captures the mouse.\n\n" - L"Pressing the assigned button when the mouse is in focus, it releases the mouse from use in-game and makes the cursor visible so it can move/resize the emulator window.\n\n" - L"Alt-tabbing to another application also makes the cursor visible, but focusing the emulation window hides it again.\n\n" - L"Pressing the button when the mouse is out of focus and visible, it captures the mouse so that it can be used as a controller again.\n\n" - L"Note 1: Though the binding appears on the page of a specific pad, pressing the button affects all mice.\n\n" - L"Note 2: By default PCSX2 uses a double-click by the left mouse button to toggle fullscreen mode, this makes the left mouse button unusable as an input." - L"To disable this option in PCSX2 go to Config > Emulation Settings > GS Window tab, and disable the \"Double-click toggles fullscreen mode\" checkbox."; - case ID_ANALOG: - return L"Bind a keys that switches the pad from digital mode to analog mode and vice versa.\n\n" - L"This option is useful when analog mode is enabled in a game that does not support it, as this causes the game to not recognise any input or to not even detect a controller.\n\n" - L"This option can also be used to enable analog mode in games that support, but do not automatically enable analog mode.\n\n" - L"Note: Analog mode enables the analog sticks to function on a DualShock controller, while in digital mode it behaves as an original PlayStation controller.\n\n"; - case ID_TURBO_KEY: - return L"Sets a key to send a TAB press to the emulator, which toggles Turbo mode(200% speed) in PCSX2."; - case ID_EXCLUDE: - return L"Disables an input so it will be ignored when trying to bind another input.\n\n" - L"This is helpful when binding controls for a device with an input that's difficult to center like an accelerator, or just always active like a faulty button or analog stick."; - case ID_LOCK_ALL_INPUT: - return L"Locks the current state of the pad. Any further input is handled normally, but the initial pad state is the locked state instead of a state with no buttons pressed. " - L"Pressing it again releases the old pad state, if the old pad state had any keys pressed. Otherwise, it's released automatically."; - case ID_LOCK_DIRECTION: - return L"Locks the current state of the d-pad and analog sticks. Pressing this when all input is locked unlocks only the pad and sticks." - L"Pressing it again will lock them again, keeping the buttons locked."; - case ID_LOCK_BUTTONS: - return L"Locks the current state of the buttons. Pressing this when all input is locked unlocks only the buttons. " - L"Pressing it again will lock them again, keeping the d-pad and analog sticks locked."; - case IDC_RAPID_FIRE: - return L"Automatically presses/releases the input every other time the button is polled."; - case IDC_FLIP: - return L"Inverts a button or axis, making down up and up down."; - case IDC_SLIDER_DEADZONE: - return L"Decreases or increases the range of an input where no input is recognised.\n\n" - L"Increasing the dead zone requires the input to be pressed harder or moved more before it is applied, decreasing it makes it recognise a softer press or a shorter movement."; - case IDC_SLIDER_SKIP_DEADZONE: - return L"Skips and avoids the dead zone to detect input earlier.\n\n" - L"Note: This is useful when a controller input requires too much movement/pressure before there's a corresponding action in-game."; - case IDC_SLIDER_SENSITIVITY: - return L"Sets how hard an axis or button is pressed.\n\n" - L"Note 1: What the default sensitivity value of \"1.00\" means depends on the device itself. The default is high enough that relative axes (which are primarily used by mice) are generally either considered fully up or down." - L"For absolute axes (and force feedback devices), which are used by most game devices, a value of 1.0 should map the device's extreme values to the extreme values of a stick/pad.\n\n" - L"Note 2: Setting the sensitivity of PC button bindings only really has an effect for PS2 analog sticks or when playing a game with full DS2 pressure sensitivity support."; - default: - if (updateText) - *updateText = false; - return L""; - } -} diff --git a/pcsx2/PAD/Windows/Tooltips.h b/pcsx2/PAD/Windows/Tooltips.h deleted file mode 100644 index a0933a7f57..0000000000 --- a/pcsx2/PAD/Windows/Tooltips.h +++ /dev/null @@ -1,23 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef TOOLTIPS_H -#define TOOLTIPS_H - -#include "Global.h" - -LPWSTR pad_dialog_message(int ID, bool* updateText = false); - -#endif diff --git a/pcsx2/PAD/Windows/VKey.cpp b/pcsx2/PAD/Windows/VKey.cpp deleted file mode 100644 index e05f2ea632..0000000000 --- a/pcsx2/PAD/Windows/VKey.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "VKey.h" - -wchar_t* GetVKStringW(unsigned char vk) -{ - int flag; - static wchar_t t[20]; - switch (vk) - { - case 0x0C: - return L"Clear"; - case 0x13: - return L"Pause"; - - case 0x21: // return "Page Up"; - case 0x22: // return "Page Down"; - case 0x23: // return "End"; - case 0x24: // return "Home"; - case 0x25: // return "Left"; - case 0x26: // return "Up"; - case 0x27: // return "Right"; - case 0x28: // return "Down"; - case 0x2D: // return "Insert"; - case 0x2E: // return "Delete"; - case 0x5B: // return "Left Windows"; - case 0x5C: // return "Right Windows"; - case 0x5D: // return "Application"; - case 0x6F: // return "Num /"; - flag = 1 << 24; - break; - - case 0x29: - return L"Select"; - case 0x2A: - return L"Print"; - case 0x2B: - return L"Execute"; - case 0x2C: - return L"Prnt Scrn"; - case 0x2F: - return L"Help"; - - case 0x6C: - return L"|"; - case 0x90: - return L"Num Lock"; - - case 0xA0: - return L"Left Shift"; - case 0xA1: - return L"Right Shift"; - case 0xA2: - return L"Left Ctrl"; - case 0xA3: - return L"Right Ctrl"; - case 0xA4: - return L"Left Alt"; - case 0xA5: - return L"Right Alt"; - - case 0xA6: - return L"Back"; - case 0xA7: - return L"Forward"; - case 0xA8: - return L"Refresh"; - case 0xA9: - return L"Stop"; - case 0xAA: - return L"Search"; - case 0xAB: - return L"Favorites"; - case 0xAC: - return L"Browser"; - - case 0xFA: - return L"Play"; - case 0xFB: - return L"Zoom"; - default: - flag = 0; - break; - } - int res = MapVirtualKey(vk, MAPVK_VK_TO_VSC); - if (res && GetKeyNameText((res << 16) | flag, t, 20)) - { - // don't trust windows - t[19] = 0; - } - else - { - wsprintfW(t, L"Key %i", vk); - } - return t; -} diff --git a/pcsx2/PAD/Windows/VKey.h b/pcsx2/PAD/Windows/VKey.h deleted file mode 100644 index dc47c9ad4e..0000000000 --- a/pcsx2/PAD/Windows/VKey.h +++ /dev/null @@ -1,17 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -// Maps virtual key codes to strings. -wchar_t* GetVKStringW(unsigned char vk); diff --git a/pcsx2/PAD/Windows/WindowsKeyboard.cpp b/pcsx2/PAD/Windows/WindowsKeyboard.cpp deleted file mode 100644 index 7a2a606a47..0000000000 --- a/pcsx2/PAD/Windows/WindowsKeyboard.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "InputManager.h" -#include "VKey.h" -#include "WindowsKeyboard.h" -#include "KeyboardQueue.h" - -WindowsKeyboard::WindowsKeyboard(DeviceAPI api, wchar_t* displayName, wchar_t* instanceID, wchar_t* deviceID) - : Device(api, KEYBOARD, displayName, instanceID, deviceID) -{ - for (int i = 0; i < 256; i++) - { - AddPhysicalControl(PSHBTN, i, i); - } -} - -wchar_t* WindowsKeyboard::GetPhysicalControlName(PhysicalControl* control) -{ - int id = control->id; - if (control->type == PSHBTN && id >= 0 && id < 256) - { - wchar_t* w = GetVKStringW(id); - if (w) - return w; - } - return Device::GetPhysicalControlName(control); -} - -void WindowsKeyboard::UpdateKey(int vkey, int state) -{ - if (vkey > 7 && vkey < 256) - { - int newState = state * FULLY_DOWN; - if (newState != physicalControlState[vkey]) - { - // Check for alt-F4 to avoid toggling skip mode incorrectly. - if (vkey != VK_F4 || !(physicalControlState[VK_MENU] || physicalControlState[VK_RMENU] || physicalControlState[VK_LMENU])) - { - HostKeyEvent::Type event = HostKeyEvent::Type::KeyPressed; - if (!newState) - event = HostKeyEvent::Type::KeyReleased; - QueueKeyEvent(vkey, event); - } - } - physicalControlState[vkey] = newState; - } -} - -void WindowsKeyboard::InitState() -{ - AllocState(); - for (int vkey = 5; vkey < 256; vkey++) - { - int value = (unsigned short)(((short)GetAsyncKeyState(vkey)) >> 15); - value += value & 1; - if (vkey == VK_CONTROL || vkey == VK_MENU || vkey == VK_SHIFT) - { - value = 0; - } - physicalControlState[vkey] = value; - } -} diff --git a/pcsx2/PAD/Windows/WindowsKeyboard.h b/pcsx2/PAD/Windows/WindowsKeyboard.h deleted file mode 100644 index 9c87743855..0000000000 --- a/pcsx2/PAD/Windows/WindowsKeyboard.h +++ /dev/null @@ -1,26 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -// Shared functionality for WM and RAW keyboards. -class WindowsKeyboard : public Device -{ -public: - WindowsKeyboard(DeviceAPI api, wchar_t* displayName, wchar_t* instanceID = 0, wchar_t* deviceID = 0); - wchar_t* GetPhysicalControlName(PhysicalControl* control); - void UpdateKey(int vkey, int state); - // Calls AllocState() and initializes to current keyboard state using - // GetAsyncKeyState(). - void InitState(); -}; diff --git a/pcsx2/PAD/Windows/WindowsMessaging.cpp b/pcsx2/PAD/Windows/WindowsMessaging.cpp deleted file mode 100644 index 8a58faaf3f..0000000000 --- a/pcsx2/PAD/Windows/WindowsMessaging.cpp +++ /dev/null @@ -1,222 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "InputManager.h" -#include "WindowsMessaging.h" -#include "VKey.h" -#include "DeviceEnumerator.h" -#include "WndProcEater.h" -#include "WindowsKeyboard.h" -#include "WindowsMouse.h" - -ExtraWndProcResult WindowsMessagingWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* output); - -class WindowsMessagingKeyboard; -class WindowsMessagingMouse; - -static WindowsMessagingKeyboard* wmk = 0; -static WindowsMessagingMouse* wmm = 0; - -class WindowsMessagingKeyboard : public WindowsKeyboard -{ -public: - WindowsMessagingKeyboard() - : WindowsKeyboard(WM, L"WM Keyboard") - { - } - - int Activate(InitInfo* initInfo) - { - // Redundant. Should match the next line. - // Deactivate(); - if (wmk) - wmk->Deactivate(); - - hWndProc = initInfo->hWndProc; - - if (!wmm) - hWndProc->Eat(WindowsMessagingWndProc, EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES); - - wmk = this; - InitState(); - - active = 1; - return 1; - } - - void Deactivate() - { - if (active) - { - if (!wmm) - hWndProc->ReleaseExtraProc(WindowsMessagingWndProc); - wmk = 0; - active = 0; - FreeState(); - } - } - - - void CheckKey(int vkey) - { - UpdateKey(vkey, 1 & (((unsigned short)GetAsyncKeyState(vkey)) >> 15)); - } -}; - -class WindowsMessagingMouse : public WindowsMouse -{ -public: - WindowsMessagingMouse() - : WindowsMouse(WM, 1, L"WM Mouse") - { - } - - int Activate(InitInfo* initInfo) - { - // Redundant. Should match the next line. - // Deactivate(); - if (wmm) - wmm->Deactivate(); - hWndProc = initInfo->hWndProc; - - if (!wmk) - hWndProc->Eat(WindowsMessagingWndProc, EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES); - - GetMouseCapture(hWndProc->hWndEaten); - - active = 1; - - wmm = this; - AllocState(); - - return 1; - } - - void Deactivate() - { - if (active) - { - if (!wmk) - hWndProc->ReleaseExtraProc(WindowsMessagingWndProc); - ReleaseMouseCapture(); - wmm = 0; - active = 0; - FreeState(); - } - } -}; - -ExtraWndProcResult WindowsMessagingWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* output) -{ - if (wmk) - { - if (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN || uMsg == WM_KEYUP || uMsg == WM_SYSKEYUP) - { - if (wParam == VK_SHIFT) - { - wmk->CheckKey(VK_RSHIFT); - wmk->CheckKey(VK_LSHIFT); - } - else if (wParam == VK_CONTROL) - { - wmk->CheckKey(VK_RCONTROL); - wmk->CheckKey(VK_LCONTROL); - } - else if (wParam == VK_MENU) - { - wmk->CheckKey(VK_RMENU); - wmk->CheckKey(VK_LMENU); - } - else - wmk->UpdateKey(wParam, (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN)); - return NO_WND_PROC; - } - // Needed to prevent default handling of keys in some situations. - else if (uMsg == WM_CHAR || uMsg == WM_UNICHAR) - { - return NO_WND_PROC; - } - else if (uMsg == WM_ACTIVATE) - { - // Not really needed, but doesn't hurt. - memset(wmk->physicalControlState, 0, sizeof(int) * wmk->numPhysicalControls); - } - } - if (wmm) - { - if (uMsg == WM_MOUSEMOVE) - { - POINT p; - GetCursorPos(&p); - // Need check to prevent cursor movement cascade. - if (p.x != wmm->center.x || p.y != wmm->center.y) - { - wmm->UpdateAxis(0, p.x - wmm->center.x); - wmm->UpdateAxis(1, p.y - wmm->center.y); - - SetCursorPos(wmm->center.x, wmm->center.y); - } - return NO_WND_PROC; - } - else if (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONUP) - { - wmm->UpdateButton(0, uMsg == WM_LBUTTONDOWN); - return NO_WND_PROC; - } - else if (uMsg == WM_RBUTTONDOWN || uMsg == WM_RBUTTONUP) - { - wmm->UpdateButton(1, uMsg == WM_RBUTTONDOWN); - return NO_WND_PROC; - } - else if (uMsg == WM_MBUTTONDOWN || uMsg == WM_MBUTTONUP) - { - wmm->UpdateButton(2, uMsg == WM_MBUTTONDOWN); - return NO_WND_PROC; - } - else if (uMsg == WM_XBUTTONDOWN || uMsg == WM_XBUTTONUP) - { - wmm->UpdateButton(3 + ((wParam >> 16) == XBUTTON2), uMsg == WM_XBUTTONDOWN); - return NO_WND_PROC; - } - else if (uMsg == WM_MOUSEWHEEL) - { - wmm->UpdateAxis(2, ((int)wParam >> 16) / WHEEL_DELTA); - return NO_WND_PROC; - } - else if (uMsg == WM_MOUSEHWHEEL) - { - wmm->UpdateAxis(3, ((int)wParam >> 16) / WHEEL_DELTA); - return NO_WND_PROC; - } - else if (uMsg == WM_SIZE && wmm->active) - { - WindowsMouse::WindowResized(hWnd); - } - // Taken care of elsewhere. When binding, killing focus means stop reading input. - // When running PCSX2, I release all mouse and keyboard input elsewhere. - /*else if (uMsg == WM_KILLFOCUS) { - wmm->Deactivate(); - }//*/ - } - return CONTINUE_BLISSFULLY; -} - -void EnumWindowsMessagingDevices() -{ - dm->AddDevice(new WindowsMessagingKeyboard()); - dm->AddDevice(new WindowsMessagingMouse()); -} diff --git a/pcsx2/PAD/Windows/WindowsMessaging.h b/pcsx2/PAD/Windows/WindowsMessaging.h deleted file mode 100644 index e5664dfa46..0000000000 --- a/pcsx2/PAD/Windows/WindowsMessaging.h +++ /dev/null @@ -1,16 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -void EnumWindowsMessagingDevices(); diff --git a/pcsx2/PAD/Windows/WindowsMouse.cpp b/pcsx2/PAD/Windows/WindowsMouse.cpp deleted file mode 100644 index 1e58058ab1..0000000000 --- a/pcsx2/PAD/Windows/WindowsMouse.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" - -#include "InputManager.h" -#include "WindowsMouse.h" - -POINT WindowsMouse::origCursorPos; -POINT WindowsMouse::center; - -WindowsMouse::WindowsMouse(DeviceAPI api, int hWheel, wchar_t* displayName, wchar_t* instanceID, wchar_t* deviceID) - : Device(api, MOUSE, displayName, instanceID, deviceID) -{ - int i; - for (i = 0; i < 5; i++) - { - AddPhysicalControl(PSHBTN, i, i); - } - - for (i = 0; i < 3 + hWheel; i++) - { - AddPhysicalControl(RELAXIS, i + 5, i + 5); - } -} - -wchar_t* WindowsMouse::GetPhysicalControlName(PhysicalControl* control) -{ - if (control->id < 9) - { - wchar_t* names[9] = { - L"L Button", - L"R Button", - L"M Button", - L"Mouse 4", - L"Mouse 5", - L"X Axis", - L"Y Axis", - L"Y Wheel", - L"X Wheel"}; - - return names[control->id]; - } - return Device::GetPhysicalControlName(control); -} - -void WindowsMouse::UpdateButton(unsigned int button, int state) -{ - if (button > 4) - return; - physicalControlState[button] = (state << 16); -} - -void WindowsMouse::UpdateAxis(unsigned int axis, int delta) -{ - if (axis > 3) - return; - // 1 mouse pixel = 1/8th way down. - physicalControlState[5 + axis] += (delta << (16 - 3 * (axis < 2))); -} - -void WindowsMouse::WindowResized(HWND hWnd) -{ - RECT r; - GetWindowRect(hWnd, &r); - ClipCursor(&r); - center.x = (r.left + r.right) / 2; - center.y = (r.top + r.bottom) / 2; - SetCursorPos(center.x, center.y); -} - -void WindowsMouse::GetMouseCapture(HWND hWnd) -{ - SetCapture(hWnd); - ShowCursor(0); - - GetCursorPos(&origCursorPos); - - RECT r; - GetWindowRect(hWnd, &r); - ClipCursor(&r); - center.x = (r.left + r.right) / 2; - center.y = (r.top + r.bottom) / 2; - SetCursorPos(center.x, center.y); -} - -void WindowsMouse::ReleaseMouseCapture() -{ - ClipCursor(0); - ReleaseCapture(); - ShowCursor(1); - SetCursorPos(origCursorPos.x, origCursorPos.y); -} diff --git a/pcsx2/PAD/Windows/WindowsMouse.h b/pcsx2/PAD/Windows/WindowsMouse.h deleted file mode 100644 index 9158b002a0..0000000000 --- a/pcsx2/PAD/Windows/WindowsMouse.h +++ /dev/null @@ -1,40 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -// Shared functionality for WM and RAW keyboards. -class WindowsMouse : public Device -{ -public: - // Used by GetMouseCapture()/ReleaseMouseCapture() - // Static because can have multiple raw mice active at once, - // and only get/release capture once. - static POINT origCursorPos; - static POINT center; - - static void GetMouseCapture(HWND hWnd); - static void WindowResized(HWND hWnd); - static void ReleaseMouseCapture(); - - // hWheel variable lets me display no horizontal wheel for raw input, just to make it clear - // that it's not supported. - WindowsMouse(DeviceAPI api, int hWheel, wchar_t* displayName, wchar_t* instanceID = 0, wchar_t* deviceID = 0); - wchar_t* GetPhysicalControlName(PhysicalControl* control); - // State is 0 for up, 1 for down. - void UpdateButton(unsigned int button, int state); - // 0/1 are x/y. 2 is vert wheel, 3 is horiz wheel. - // Delta is in my micro units. change of (1<<16) is 1 full unit, with - // the default sensitivity. - void UpdateAxis(unsigned int axis, int delta); -}; diff --git a/pcsx2/PAD/Windows/WndProcEater.cpp b/pcsx2/PAD/Windows/WndProcEater.cpp deleted file mode 100644 index ea4b8ba948..0000000000 --- a/pcsx2/PAD/Windows/WndProcEater.cpp +++ /dev/null @@ -1,158 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include "WndProcEater.h" - -WndProcEater::WndProcEater() - : hWndEaten(0) - , eatenWndProc(0) - , extraProcs(0) - , numExtraProcs(0) - , hMutex(CreateMutex(0, 0, L"PAD")) -{ -} - -WndProcEater::~WndProcEater() throw() -{ - if (hMutex) - { - ReleaseMutex(hMutex); - CloseHandle(hMutex); - } -} - -void WndProcEater::ReleaseExtraProc(ExtraWndProc proc) -{ - // Probably isn't needed, but just in case... - if (hMutex) - WaitForSingleObject(hMutex, 100); - - for (int i = 0; i < numExtraProcs; i++) - { - if (extraProcs[i].proc == proc) - { - extraProcs[i] = extraProcs[--numExtraProcs]; - break; - } - } - if (!numExtraProcs && eatenWndProc) - { - free(extraProcs); - extraProcs = 0; - // As numExtraProcs is 0, won't cause recursion if called from Release(). - Release(); - } -} - -void WndProcEater::Release() -{ - while (numExtraProcs) - ReleaseExtraProc(extraProcs[0].proc); - if (hWndEaten && IsWindow(hWndEaten)) - { - RemoveProp(hWndEaten, L"PADHaxxor"); - SetWindowLongPtr(hWndEaten, GWLP_WNDPROC, (LONG_PTR)eatenWndProc); - hWndEaten = 0; - eatenWndProc = 0; - } -} - -LRESULT WndProcEater::_OverrideWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (hWnd != hWndEaten) - fprintf(stderr, "Totally mismatched window handles on OverrideWndProc!\n"); - - ExtraWndProcResult res = CONTINUE_BLISSFULLY; - LRESULT out = 0; - // Here because want it for binding, even when no keyboard mode is selected. - if (uMsg == WM_GETDLGCODE) - { - return DLGC_WANTALLKEYS | CallWindowProc(eatenWndProc, hWnd, uMsg, wParam, lParam); - } - - for (int i = 0; i < numExtraProcs; i++) - { - // Note: Second bit of deviceUpdateQueued is only set when I receive a device change - // notification, which is handled in the GS thread in one of the extraProcs, so this - // is all I need to prevent bad things from happening while updating devices. No mutex needed. - // if ((deviceUpdateQueued&2) && (extraProcs[i].flags & EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES)) continue; - - ExtraWndProcResult res2 = extraProcs[i].proc(hWnd, uMsg, wParam, lParam, &out); - if (res2 != res) - { - if (res2 == CONTINUE_BLISSFULLY_AND_RELEASE_PROC) - { - ReleaseExtraProc(extraProcs[i].proc); - i--; - } - else if (res2 > res) - res = res2; - } - } - - if (res != NO_WND_PROC) - { - if (out == WM_DESTROY) - { - Release(); - } - if (res == CONTINUE_BLISSFULLY) - out = CallWindowProc(eatenWndProc, hWnd, uMsg, wParam, lParam); - else if (res == USE_DEFAULT_WND_PROC) - out = DefWindowProc(hWnd, uMsg, wParam, lParam); - } - return out; -} - -static LRESULT CALLBACK OverrideWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - WndProcEater* obj = (WndProcEater*)GetProp(hWnd, L"PADHaxxor"); - return (obj == NULL) ? - DefWindowProc(hWnd, uMsg, wParam, lParam) : - obj->_OverrideWndProc(hWnd, uMsg, wParam, lParam); -} - -bool WndProcEater::SetWndHandle(HWND hWnd) -{ - if (hWnd == hWndEaten) - return true; - - Release(); - SetProp(hWnd, L"PADHaxxor", (HANDLE)this); - - eatenWndProc = (WNDPROC)SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)OverrideWndProc); - hWndEaten = (eatenWndProc) ? hWnd : 0; - - return !!hWndEaten; -} - -void WndProcEater::Eat(ExtraWndProc proc, DWORD flags) -{ - - // check if Subclassing failed to init during SetWndHandle - if (!hWndEaten) - return; - - // Probably isn't needed, but just in case... - if (hMutex) - WaitForSingleObject(hMutex, 100); - - extraProcs = (ExtraWndProcInfo*)realloc(extraProcs, sizeof(ExtraWndProcInfo) * (numExtraProcs + 1)); - extraProcs[numExtraProcs].proc = proc; - extraProcs[numExtraProcs].flags = flags; - numExtraProcs++; -} diff --git a/pcsx2/PAD/Windows/WndProcEater.h b/pcsx2/PAD/Windows/WndProcEater.h deleted file mode 100644 index e14b08e96e..0000000000 --- a/pcsx2/PAD/Windows/WndProcEater.h +++ /dev/null @@ -1,63 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see .4 - */ - -#include "common/RedtapeWindows.h" - -#define EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES 1 - -/* Need this to let window be subclassed multiple times but still clean up nicely. - */ -enum ExtraWndProcResult -{ - CONTINUE_BLISSFULLY, - // Calls ReleaseExtraProc without messing up order. - CONTINUE_BLISSFULLY_AND_RELEASE_PROC, - USE_DEFAULT_WND_PROC, - NO_WND_PROC -}; - -typedef ExtraWndProcResult (*ExtraWndProc)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* out); - -struct ExtraWndProcInfo -{ - ExtraWndProc proc; - DWORD flags; -}; - -class WndProcEater -{ -public: - HWND hWndEaten; - WNDPROC eatenWndProc; - ExtraWndProcInfo* extraProcs; - int numExtraProcs; - - HANDLE hMutex; - -public: - WndProcEater(); - virtual ~WndProcEater() throw(); - - bool SetWndHandle(HWND hWnd); - void Eat(ExtraWndProc proc, DWORD flags); - void ReleaseExtraProc(ExtraWndProc proc); - void Release(); - - LRESULT _OverrideWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -}; - -extern WndProcEater hWndGSProc; -extern WndProcEater hWndTopProc; -extern WndProcEater hWndButtonProc; diff --git a/pcsx2/PAD/Windows/XInputEnum.cpp b/pcsx2/PAD/Windows/XInputEnum.cpp deleted file mode 100644 index e39d1a5e26..0000000000 --- a/pcsx2/PAD/Windows/XInputEnum.cpp +++ /dev/null @@ -1,329 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Global.h" -#include -#include -#include "VKey.h" -#include "InputManager.h" -#include "XInputEnum.h" -#include "PADConfig.h" - -// Extra enum -#define XINPUT_GAMEPAD_GUIDE 0x0400 - -typedef struct -{ - float SCP_UP; - float SCP_RIGHT; - float SCP_DOWN; - float SCP_LEFT; - - float SCP_LX; - float SCP_LY; - - float SCP_L1; - float SCP_L2; - float SCP_L3; - - float SCP_RX; - float SCP_RY; - - float SCP_R1; - float SCP_R2; - float SCP_R3; - - float SCP_T; - float SCP_C; - float SCP_X; - float SCP_S; - - float SCP_SELECT; - float SCP_START; - - float SCP_PS; - -} SCP_EXTN; - - -// This way, I don't require that XInput junk be installed. -typedef void(CALLBACK* _XInputEnable)(BOOL enable); -typedef DWORD(CALLBACK* _XInputGetStateEx)(DWORD dwUserIndex, XINPUT_STATE* pState); -typedef DWORD(CALLBACK* _XInputGetExtended)(DWORD dwUserIndex, SCP_EXTN* pPressure); -typedef DWORD(CALLBACK* _XInputSetState)(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration); - -_XInputEnable pXInputEnable = 0; -_XInputGetStateEx pXInputGetStateEx = 0; -_XInputGetExtended pXInputGetExtended = 0; -_XInputSetState pXInputSetState = 0; -static bool xinputNotInstalled = false; - -static int xInputActiveCount = 0; - -// Completely unncessary, really. -__forceinline int ShortToAxis(int v) -{ - // If positive and at least 1 << 14, increment. - v += (!((v >> 15) & 1)) & ((v >> 14) & 1); - // Just double. - return v * 2; -} - -class XInputDevice : public Device -{ - // Cached last vibration values by pad and motor. - // Need this, as only one value is changed at a time. - int ps2Vibration[2][4][2]; - // Minor optimization - cache last set vibration values - // When there's no change, no need to do anything. - XINPUT_VIBRATION xInputVibration; - -public: - int index; - - XInputDevice(int index, wchar_t* displayName) - : Device(XINPUT, OTHER, displayName) - { - memset(ps2Vibration, 0, sizeof(ps2Vibration)); - memset(&xInputVibration, 0, sizeof(xInputVibration)); - this->index = index; - int i; - for (i = 0; i < 17; i++) - { // Skip empty bit - AddPhysicalControl(PRESSURE_BTN, i + (i > 10), 0); - } - for (; i < 21; i++) - { - AddPhysicalControl(ABSAXIS, i + 2, 0); - } - AddFFAxis(L"Slow Motor", 0); - AddFFAxis(L"Fast Motor", 1); - AddFFEffectType(L"Constant Effect", L"Constant", EFFECT_CONSTANT); - } - - wchar_t* GetPhysicalControlName(PhysicalControl* c) - { - unsigned int i = (unsigned int)(c - physicalControls); - if (i < 21) - { - const static wchar_t* names[] = { - L"D-pad Up", - L"D-pad Down", - L"D-pad Left", - L"D-pad Right", - L"Start", - L"Back", - L"Left Thumb", - L"Right Thumb", - L"Left Shoulder", - L"Right Shoulder", - L"Guide", - L"A", - L"B", - L"X", - L"Y", - L"Left Trigger", - L"Right Trigger", - L"Left Thumb X", - L"Left Thumb Y", - L"Right Thumb X", - L"Right Thumb Y", - }; - - return (wchar_t*)names[i]; - } - return Device::GetPhysicalControlName(c); - } - - int Activate(InitInfo* initInfo) - { - if (active) - Deactivate(); - if (!xInputActiveCount) - { - pXInputEnable(1); - } - xInputActiveCount++; - active = 1; - AllocState(); - return 1; - } - - int Update() - { - if (!active) - return 0; - SCP_EXTN pressure; - if (!pXInputGetExtended || (ERROR_SUCCESS != pXInputGetExtended(index, &pressure))) - { - XINPUT_STATE state; - if (ERROR_SUCCESS != pXInputGetStateEx(index, &state)) - { - Deactivate(); - return 0; - } - - int buttons = state.Gamepad.wButtons; - for (int i = 0; i < 15; i++) - { - physicalControlState[i] = ((buttons >> physicalControls[i].id) & 1) << 16; - } - physicalControlState[15] = (int)(state.Gamepad.bLeftTrigger * 257.005); - physicalControlState[16] = (int)(state.Gamepad.bRightTrigger * 257.005); - physicalControlState[17] = ShortToAxis(state.Gamepad.sThumbLX); - physicalControlState[18] = ShortToAxis(state.Gamepad.sThumbLY); - physicalControlState[19] = ShortToAxis(state.Gamepad.sThumbRX); - physicalControlState[20] = ShortToAxis(state.Gamepad.sThumbRY); - } - else - { - physicalControlState[0] = (int)(pressure.SCP_UP * FULLY_DOWN); - physicalControlState[1] = (int)(pressure.SCP_DOWN * FULLY_DOWN); - physicalControlState[2] = (int)(pressure.SCP_LEFT * FULLY_DOWN); - physicalControlState[3] = (int)(pressure.SCP_RIGHT * FULLY_DOWN); - physicalControlState[4] = (int)(pressure.SCP_START * FULLY_DOWN); - physicalControlState[5] = (int)(pressure.SCP_SELECT * FULLY_DOWN); - physicalControlState[6] = (int)(pressure.SCP_L3 * FULLY_DOWN); - physicalControlState[7] = (int)(pressure.SCP_R3 * FULLY_DOWN); - physicalControlState[8] = (int)(pressure.SCP_L1 * FULLY_DOWN); - physicalControlState[9] = (int)(pressure.SCP_R1 * FULLY_DOWN); - physicalControlState[10] = (int)(pressure.SCP_PS * FULLY_DOWN); - physicalControlState[11] = (int)(pressure.SCP_X * FULLY_DOWN); - physicalControlState[12] = (int)(pressure.SCP_C * FULLY_DOWN); - physicalControlState[13] = (int)(pressure.SCP_S * FULLY_DOWN); - physicalControlState[14] = (int)(pressure.SCP_T * FULLY_DOWN); - physicalControlState[15] = (int)(pressure.SCP_L2 * FULLY_DOWN); - physicalControlState[16] = (int)(pressure.SCP_R2 * FULLY_DOWN); - physicalControlState[17] = (int)(pressure.SCP_LX * FULLY_DOWN); - physicalControlState[18] = (int)(pressure.SCP_LY * FULLY_DOWN); - physicalControlState[19] = (int)(pressure.SCP_RX * FULLY_DOWN); - physicalControlState[20] = (int)(pressure.SCP_RY * FULLY_DOWN); - } - return 1; - } - - void SetEffects(unsigned char port, unsigned int slot, unsigned char motor, unsigned char force) - { - ps2Vibration[port][slot][motor] = force; - int newVibration[2] = {0, 0}; - for (int p = 0; p < 2; p++) - { - for (int s = 0; s < 4; s++) - { - int padtype = config.padConfigs[p][s].type; - for (int i = 0; i < pads[p][s][padtype].numFFBindings; i++) - { - // Technically should also be a *65535/BASE_SENSITIVITY, but that's close enough to 1 for me. - ForceFeedbackBinding* ffb = &pads[p][s][padtype].ffBindings[i]; - newVibration[0] += (int)((ffb->axes[0].force * (__int64)ps2Vibration[p][s][ffb->motor]) / 255); - newVibration[1] += (int)((ffb->axes[1].force * (__int64)ps2Vibration[p][s][ffb->motor]) / 255); - } - } - } - newVibration[0] = abs(newVibration[0]); - if (newVibration[0] > 65535) - { - newVibration[0] = 65535; - } - newVibration[1] = abs(newVibration[1]); - if (newVibration[1] > 65535) - { - newVibration[1] = 65535; - } - if (newVibration[0] || newVibration[1] || newVibration[0] != xInputVibration.wLeftMotorSpeed || newVibration[1] != xInputVibration.wRightMotorSpeed) - { - XINPUT_VIBRATION newv = {(WORD)newVibration[0], (WORD)newVibration[1]}; - if (ERROR_SUCCESS == pXInputSetState(index, &newv)) - { - xInputVibration = newv; - } - } - } - - void SetEffect(ForceFeedbackBinding* binding, unsigned char force) - { - PadBindings pBackup = pads[0][0][0]; - pads[0][0][0].ffBindings = binding; - pads[0][0][0].numFFBindings = 1; - SetEffects(0, 0, binding->motor, 255); - pads[0][0][0] = pBackup; - } - - void Deactivate() - { - memset(&xInputVibration, 0, sizeof(xInputVibration)); - memset(ps2Vibration, 0, sizeof(ps2Vibration)); - pXInputSetState(index, &xInputVibration); - - FreeState(); - if (active) - { - if (!--xInputActiveCount) - { - pXInputEnable(0); - } - active = 0; - } - } - - ~XInputDevice() - { - } -}; - -void EnumXInputDevices() -{ - wchar_t temp[30]; - if (!pXInputSetState) - { - // XInput not installed, so don't repeatedly try to load it. - if (xinputNotInstalled) - return; - - // Prefer XInput 1.3 since SCP only has an XInput 1.3 wrapper right now. - // Also use LoadLibrary and not LoadLibraryEx for XInput 1.3, since some - // Windows 7 systems have issues with it. - // FIXME: Missing FreeLibrary call. - HMODULE hMod = LoadLibrary(L"xinput1_3.dll"); - if (hMod == nullptr && IsWindows8OrGreater()) - { - hMod = LoadLibraryEx(L"XInput1_4.dll", nullptr, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); - } - - if (hMod) - { - if ((pXInputEnable = (_XInputEnable)GetProcAddress(hMod, "XInputEnable")) && - ((pXInputGetStateEx = (_XInputGetStateEx)GetProcAddress(hMod, (LPCSTR)100)) || // Try Ex version first - (pXInputGetStateEx = (_XInputGetStateEx)GetProcAddress(hMod, "XInputGetState")))) - { - pXInputGetExtended = (_XInputGetExtended)GetProcAddress(hMod, "XInputGetExtended"); - pXInputSetState = (_XInputSetState)GetProcAddress(hMod, "XInputSetState"); - } - } - if (!pXInputSetState) - { - xinputNotInstalled = true; - return; - } - } - pXInputEnable(1); - for (int i = 0; i < 4; i++) - { - wsprintfW(temp, L"XInput Pad %i", i); - dm->AddDevice(new XInputDevice(i, temp)); - } - pXInputEnable(0); -} diff --git a/pcsx2/PAD/Windows/XInputEnum.h b/pcsx2/PAD/Windows/XInputEnum.h deleted file mode 100644 index 736b925c77..0000000000 --- a/pcsx2/PAD/Windows/XInputEnum.h +++ /dev/null @@ -1,16 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -void EnumXInputDevices(); diff --git a/pcsx2/PAD/Windows/resource_pad.h b/pcsx2/PAD/Windows/resource_pad.h deleted file mode 100644 index d51b4347cb..0000000000 --- a/pcsx2/PAD/Windows/resource_pad.h +++ /dev/null @@ -1,155 +0,0 @@ -//{{NO_DEPENDENCIES}} -// fichier Include Microsoft Visual C++. -// Utilis� par PAD.rc -// -// clang-format off -#define IDD_GENERAL 0x366 -#define IDD_CONFIG 0x369 -#define IDD_CONFIG_GUITAR 0x36A -#define IDD_PROPPAGE_LARGE 0x36B -#define IDC_CURSOR1 0x36C -#define IDD_DIAG 0x36D -#define IDR_INI1 0x36E -#define IDD_CONFIG_POPN 0x36F -#define IDD_CONFIG_PS1_MOUSE 0x370 -#define IDD_CONFIG_NEGCON 0x371 -#define IDC_KB_DISABLE 0x344C -#define IDC_KB_WM 0x344E -#define IDC_KB_RAW 0x344F -#define IDC_DISABLE_PAD1 0x3450 -#define IDC_M_DISABLE 0x3451 -#define IDC_M_WM 0x3453 -#define IDC_M_RAW 0x3454 -#define IDC_G_XI 0x3455 -#define IDC_G_DI 0x3456 -#define IDC_G_DS3 0x3457 -#define IDC_DEBUG_FILE 0x3458 -#define IDC_GUITAR1 0x3459 -#define IDC_MULTITAP1 0x345A -#define IDC_MOUSE_UNFOCUS 0x345B -#define IDC_AXIS_BUTTONS 0x345C -#define IDC_MULTITAP2 0x345D -#define IDC_BACKGROUND 0x345E -#define IDC_MULTIPLE_BINDING 0x345F -#define IDC_GH2_HACK 0x3461 -#define IDC_PAD_LIST 0x3462 -#define IDC_COMBO1 0x3463 -#define IDC_PAD_TYPE 0x3464 -#define IDC_DIAG_LIST 0x3465 -#define ID_SAVE 0x3466 -#define ID_LOAD 0x3467 -#define ID_RESTORE_DEFAULTS 0x3468 -#define IDC_BINDINGS_LIST 0x3F00 -#define IDC_SLIDER_SENSITIVITY 0x4000 -#define IDC_FLIP 0x4001 -#define IDC_AXIS_DIRECTION 0x4002 -#define IDC_AXIS_CONTROL 0x4003 -#define IDC_AXIS_SENSITIVITY 0x4004 -#define IDC_RAPID_FIRE 0x4005 -#define IDC_AXIS_DEVICE 0x4006 -#define ID_SENSITIVITY 0x4007 -#define IDC_SLIDER_DEADZONE 0x4008 -#define IDC_AXIS_DEADZONE 0x4009 -#define IDC_LABEL_SENSITIVITY 0x400A -#define IDC_LABEL_DEADZONE 0x400B -#define IDC_LABEL_SKIP_DEADZONE 0x400C -#define IDC_SKIP_DEADZONE_OFF 0x400D -#define IDC_SLIDER_SKIP_DEADZONE 0x400E -#define IDC_AXIS_SKIP_DEADZONE 0x400F -#define IDC_DPAD 0x40D0 -#define IDC_LSTICK 0x40D1 -#define IDC_RSTICK 0x40D2 -#define IDC_FACE 0x40D3 -#define IDC_SHOULDER 0x40D4 -#define IDC_FACE_ANALOG 0x40D5 -#define ID_MOUSE 0x40FF -#define ID_SELECT 0x4100 -#define ID_L3 0x4101 -#define ID_R3 0x4102 -#define ID_START 0x4103 -#define ID_DPAD_UP 0x4104 -#define ID_DPAD_RIGHT 0x4105 -#define ID_DPAD_DOWN 0x4106 -#define ID_DPAD_LEFT 0x4107 -#define ID_L2 0x4108 -#define ID_R2 0x4109 -#define ID_L1 0x410A -#define ID_R1 0x410B -#define ID_TRIANGLE 0x410C -#define ID_CIRCLE 0x410D -#define ID_CROSS 0x410E -#define ID_SQUARE 0x410F -#define ID_LSTICK_UP 0x4110 -#define ID_LSTICK_RIGHT 0x4111 -#define ID_LSTICK_DOWN 0x4112 -#define ID_LSTICK_LEFT 0x4113 -#define ID_RSTICK_UP 0x4114 -#define ID_RSTICK_RIGHT 0x4115 -#define ID_RSTICK_DOWN 0x4116 -#define ID_RSTICK_LEFT 0x4117 -#define ID_ANALOG 0x4118 -#define ID_EXCLUDE 0x4119 -#define ID_LOCK_BUTTONS 0x411A -#define ID_LOCK_ALL_INPUT 0x411B -#define ID_LOCK_DIRECTION 0x411C -#define ID_TURBO_KEY 0x411D -#define ID_QUICK_SETUP 0x411E -#define IDC_QUICK_SETUP_TEXT 0x411F -#define IDC_FORCEFEEDBACK 0x4200 -#define IDC_FORCEFEEDBACK_FUNCTION 0x4201 -#define ID_BIG_MOTOR 0x4202 -#define ID_SMALL_MOTOR 0x4203 -#define ID_FORCEFEEDBACK_BOX 0x4204 -#define IDC_CONFIGURE_ON_BIND 0x4230 -#define IDC_DEVICE_SELECT 0x4231 -#define ID_CLEAR 0x4232 -#define ID_SPECIAL_INPUTS 0x4233 -#define ID_TEST 0x4300 -#define ID_FF 0x4301 -#define IDC_FF_EFFECT 0x4302 -#define IDC_FF_AXIS1_ENABLED 0x4310 -#define IDC_FF_AXIS1 0x4311 -#define IDC_FF_AXIS1_FLIP 0x4312 -#define IDC_FF_AXIS1_SCALE 0x4313 -#define IDC_FF_AXIS2_ENABLED 0x4320 -#define IDC_FF_AXIS2 0x4321 -#define IDC_FF_AXIS2_FLIP 0x4322 -#define IDC_FF_AXIS2_SCALE 0x4323 -#define IDC_FF_AXIS3_ENABLED 0x4330 -#define IDC_FF_AXIS3 0x4331 -#define IDC_FF_AXIS3_FLIP 0x4332 -#define IDC_FF_AXIS3_SCALE 0x4333 -#define IDC_FF_AXIS4_ENABLED 0x4340 -#define IDC_FF_AXIS4 0x4341 -#define IDC_FF_AXIS4_FLIP 0x4342 -#define IDC_FF_AXIS4_SCALE 0x4343 -#define IDC_FF_AXIS5_ENABLED 0x4350 -#define IDC_FF_AXIS5 0x4351 -#define IDC_FF_AXIS5_FLIP 0x4352 -#define IDC_FF_AXIS5_SCALE 0x4353 -#define IDC_FF_AXIS6_ENABLED 0x4360 -#define IDC_FF_AXIS6 0x4361 -#define IDC_FF_AXIS6_FLIP 0x4362 -#define IDC_FF_AXIS6_SCALE 0x4363 -#define IDC_FF_AXIS7_ENABLED 0x4370 -#define IDC_FF_AXIS7 0x4371 -#define IDC_FF_AXIS7_FLIP 0x4372 -#define IDC_FF_AXIS7_SCALE 0x4373 -#define IDC_FF_AXIS8_ENABLED 0x4380 -#define IDC_FF_AXIS8 0x4381 -#define IDC_FF_AXIS8_FLIP 0x4382 -#define IDC_FF_AXIS8_SCALE 0x4383 -#define ID_CONTROLS 0x4390 -#define ID_RESET_CONFIG 0x4391 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 116 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 5010 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif -// clang-format on diff --git a/pcsx2/PAD/Windows/usb.h b/pcsx2/PAD/Windows/usb.h deleted file mode 100644 index 09c8ef3a84..0000000000 --- a/pcsx2/PAD/Windows/usb.h +++ /dev/null @@ -1,420 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef __USB_H__ -#define __USB_H__ - -/* - * 'interface' is defined somewhere in the Windows header files. This macro - * is deleted here to avoid conflicts and compile errors. - */ - -#ifdef interface -#undef interface -#endif - -/* - * PATH_MAX from limits.h can't be used on Windows if the dll and - * import libraries are build/used by different compilers - */ - -#define LIBUSB_PATH_MAX 512 - - -/* - * USB spec information - * - * This is all stuff grabbed from various USB specs and is pretty much - * not subject to change - */ - -/* - * Device and/or Interface Class codes - */ -#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ -#define USB_CLASS_AUDIO 1 -#define USB_CLASS_COMM 2 -#define USB_CLASS_HID 3 -#define USB_CLASS_PRINTER 7 -#define USB_CLASS_MASS_STORAGE 8 -#define USB_CLASS_HUB 9 -#define USB_CLASS_DATA 10 -#define USB_CLASS_VENDOR_SPEC 0xff - -/* - * Descriptor types - */ -#define USB_DT_DEVICE 0x01 -#define USB_DT_CONFIG 0x02 -#define USB_DT_STRING 0x03 -#define USB_DT_INTERFACE 0x04 -#define USB_DT_ENDPOINT 0x05 - -#define USB_DT_HID 0x21 -#define USB_DT_REPORT 0x22 -#define USB_DT_PHYSICAL 0x23 -#define USB_DT_HUB 0x29 - -/* - * Descriptor sizes per descriptor type - */ -#define USB_DT_DEVICE_SIZE 18 -#define USB_DT_CONFIG_SIZE 9 -#define USB_DT_INTERFACE_SIZE 9 -#define USB_DT_ENDPOINT_SIZE 7 -#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */ -#define USB_DT_HUB_NONVAR_SIZE 7 - - -/* ensure byte-packed structures */ -#include - - -/* All standard descriptors have these 2 fields in common */ -struct usb_descriptor_header -{ - unsigned char bLength; - unsigned char bDescriptorType; -}; - -/* String descriptor */ -struct usb_string_descriptor -{ - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short wData[1]; -}; - -/* HID descriptor */ -struct usb_hid_descriptor -{ - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short bcdHID; - unsigned char bCountryCode; - unsigned char bNumDescriptors; -}; - -/* Endpoint descriptor */ -#define USB_MAXENDPOINTS 32 -struct usb_endpoint_descriptor -{ - unsigned char bLength; - unsigned char bDescriptorType; - unsigned char bEndpointAddress; - unsigned char bmAttributes; - unsigned short wMaxPacketSize; - unsigned char bInterval; - unsigned char bRefresh; - unsigned char bSynchAddress; - - unsigned char* extra; /* Extra descriptors */ - int extralen; -}; - -#define USB_ENDPOINT_ADDRESS_MASK 0x0f /* in bEndpointAddress */ -#define USB_ENDPOINT_DIR_MASK 0x80 - -#define USB_ENDPOINT_TYPE_MASK 0x03 /* in bmAttributes */ -#define USB_ENDPOINT_TYPE_CONTROL 0 -#define USB_ENDPOINT_TYPE_ISOCHRONOUS 1 -#define USB_ENDPOINT_TYPE_BULK 2 -#define USB_ENDPOINT_TYPE_INTERRUPT 3 - -/* Interface descriptor */ -#define USB_MAXINTERFACES 32 -struct usb_interface_descriptor -{ - unsigned char bLength; - unsigned char bDescriptorType; - unsigned char bInterfaceNumber; - unsigned char bAlternateSetting; - unsigned char bNumEndpoints; - unsigned char bInterfaceClass; - unsigned char bInterfaceSubClass; - unsigned char bInterfaceProtocol; - unsigned char iInterface; - - struct usb_endpoint_descriptor* endpoint; - - unsigned char* extra; /* Extra descriptors */ - int extralen; -}; - -#define USB_MAXALTSETTING 128 /* Hard limit */ - -struct usb_interface -{ - struct usb_interface_descriptor* altsetting; - - int num_altsetting; -}; - -/* Configuration descriptor information.. */ -#define USB_MAXCONFIG 8 -struct usb_config_descriptor -{ - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short wTotalLength; - unsigned char bNumInterfaces; - unsigned char bConfigurationValue; - unsigned char iConfiguration; - unsigned char bmAttributes; - unsigned char MaxPower; - - struct usb_interface* interface; - - unsigned char* extra; /* Extra descriptors */ - int extralen; -}; - -/* Device descriptor */ -struct usb_device_descriptor -{ - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short bcdUSB; - unsigned char bDeviceClass; - unsigned char bDeviceSubClass; - unsigned char bDeviceProtocol; - unsigned char bMaxPacketSize0; - unsigned short idVendor; - unsigned short idProduct; - unsigned short bcdDevice; - unsigned char iManufacturer; - unsigned char iProduct; - unsigned char iSerialNumber; - unsigned char bNumConfigurations; -}; - -struct usb_ctrl_setup -{ - unsigned char bRequestType; - unsigned char bRequest; - unsigned short wValue; - unsigned short wIndex; - unsigned short wLength; -}; - -/* - * Standard requests - */ -#define USB_REQ_GET_STATUS 0x00 -#define USB_REQ_CLEAR_FEATURE 0x01 -/* 0x02 is reserved */ -#define USB_REQ_SET_FEATURE 0x03 -/* 0x04 is reserved */ -#define USB_REQ_SET_ADDRESS 0x05 -#define USB_REQ_GET_DESCRIPTOR 0x06 -#define USB_REQ_SET_DESCRIPTOR 0x07 -#define USB_REQ_GET_CONFIGURATION 0x08 -#define USB_REQ_SET_CONFIGURATION 0x09 -#define USB_REQ_GET_INTERFACE 0x0A -#define USB_REQ_SET_INTERFACE 0x0B -#define USB_REQ_SYNCH_FRAME 0x0C - -#define USB_TYPE_STANDARD (0x00 << 5) -#define USB_TYPE_CLASS (0x01 << 5) -#define USB_TYPE_VENDOR (0x02 << 5) -#define USB_TYPE_RESERVED (0x03 << 5) - -#define USB_RECIP_DEVICE 0x00 -#define USB_RECIP_INTERFACE 0x01 -#define USB_RECIP_ENDPOINT 0x02 -#define USB_RECIP_OTHER 0x03 - -/* - * Various libusb API related stuff - */ - -#define USB_ENDPOINT_IN 0x80 -#define USB_ENDPOINT_OUT 0x00 - -/* Error codes */ -#define USB_ERROR_BEGIN 500000 - -/* - * This is supposed to look weird. This file is generated from autoconf - * and I didn't want to make this too complicated. - */ -#define USB_LE16_TO_CPU(x) - -/* Data types */ -/* struct usb_device; */ -/* struct usb_bus; */ - -struct usb_device -{ - struct usb_device *next, *prev; - - char filename[LIBUSB_PATH_MAX]; - - struct usb_bus* bus; - - struct usb_device_descriptor descriptor; - struct usb_config_descriptor* config; - - void* dev; /* Darwin support */ - - unsigned char devnum; - - unsigned char num_children; - struct usb_device** children; -}; - -struct usb_bus -{ - struct usb_bus *next, *prev; - - char dirname[LIBUSB_PATH_MAX]; - - struct usb_device* devices; - unsigned long location; - - struct usb_device* root_dev; -}; - -/* Version information, Windows specific */ -struct usb_version -{ - struct - { - int major; - int minor; - int micro; - int nano; - } dll; - struct - { - int major; - int minor; - int micro; - int nano; - } driver; -}; - - -struct usb_dev_handle; -typedef struct usb_dev_handle usb_dev_handle; - -/* Variables */ -#ifndef __USB_C__ -#define usb_busses usb_get_busses() -#endif - - - -#include - -#ifdef GOAT -#ifdef __cplusplus -extern "C" { -#endif - -/* Function prototypes */ - -/* usb.c */ -usb_dev_handle* usb_open(struct usb_device* dev); -int usb_close(usb_dev_handle* dev); -int usb_get_string(usb_dev_handle* dev, int index, int langid, char* buf, - size_t buflen); -int usb_get_string_simple(usb_dev_handle* dev, int index, char* buf, - size_t buflen); - -/* descriptors.c */ -int usb_get_descriptor_by_endpoint(usb_dev_handle* udev, int ep, - unsigned char type, unsigned char index, - void* buf, int size); -int usb_get_descriptor(usb_dev_handle* udev, unsigned char type, - unsigned char index, void* buf, int size); - -/* .c */ -int usb_bulk_write(usb_dev_handle* dev, int ep, char* bytes, int size, - int timeout); -int usb_bulk_read(usb_dev_handle* dev, int ep, char* bytes, int size, - int timeout); -int usb_interrupt_write(usb_dev_handle* dev, int ep, char* bytes, int size, - int timeout); -int usb_interrupt_read(usb_dev_handle* dev, int ep, char* bytes, int size, - int timeout); -int usb_control_msg(usb_dev_handle* dev, int requesttype, int request, - int value, int index, char* bytes, int size, - int timeout); -int usb_set_configuration(usb_dev_handle* dev, int configuration); -int usb_claim_interface(usb_dev_handle* dev, int interface); -int usb_release_interface(usb_dev_handle* dev, int interface); -int usb_set_altinterface(usb_dev_handle* dev, int alternate); -int usb_resetep(usb_dev_handle* dev, unsigned int ep); -int usb_clear_halt(usb_dev_handle* dev, unsigned int ep); -int usb_reset(usb_dev_handle* dev); - -char* usb_strerror(void); - -void usb_init(void); -void usb_set_debug(int level); -int usb_find_busses(void); -int usb_find_devices(void); -struct usb_device* usb_device(usb_dev_handle* dev); -struct usb_bus* usb_get_busses(void); - - -/* Windows specific functions */ - -#define LIBUSB_HAS_INSTALL_SERVICE_NP 1 -int usb_install_service_np(void); -void CALLBACK usb_install_service_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_UNINSTALL_SERVICE_NP 1 -int usb_uninstall_service_np(void); -void CALLBACK usb_uninstall_service_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_INSTALL_DRIVER_NP 1 -int usb_install_driver_np(const char* inf_file); -void CALLBACK usb_install_driver_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_TOUCH_INF_FILE_NP 1 -int usb_touch_inf_file_np(const char* inf_file); -void CALLBACK usb_touch_inf_file_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_INSTALL_NEEDS_RESTART_NP 1 -int usb_install_needs_restart_np(void); - -const struct usb_version* usb_get_version(void); - -int usb_isochronous_setup_async(usb_dev_handle* dev, void** context, - unsigned char ep, int pktsize); -int usb_bulk_setup_async(usb_dev_handle* dev, void** context, - unsigned char ep); -int usb_interrupt_setup_async(usb_dev_handle* dev, void** context, - unsigned char ep); - -int usb_submit_async(void* context, char* bytes, int size); -int usb_reap_async(void* context, int timeout); -int usb_reap_async_nocancel(void* context, int timeout); -int usb_cancel_async(void* context); -int usb_free_async(void** context); - - -#ifdef __cplusplus -} -#endif -#endif - -#endif /* __USB_H__ */ diff --git a/pcsx2/gui/Resources/AppIcon16.png b/pcsx2/Resources/AppIcon16.png similarity index 100% rename from pcsx2/gui/Resources/AppIcon16.png rename to pcsx2/Resources/AppIcon16.png diff --git a/pcsx2/gui/Resources/AppIcon32.png b/pcsx2/Resources/AppIcon32.png similarity index 100% rename from pcsx2/gui/Resources/AppIcon32.png rename to pcsx2/Resources/AppIcon32.png diff --git a/pcsx2/gui/Resources/AppIcon64.png b/pcsx2/Resources/AppIcon64.png similarity index 100% rename from pcsx2/gui/Resources/AppIcon64.png rename to pcsx2/Resources/AppIcon64.png diff --git a/pcsx2/gui/Resources/Info.plist.in b/pcsx2/Resources/Info.plist.in similarity index 97% rename from pcsx2/gui/Resources/Info.plist.in rename to pcsx2/Resources/Info.plist.in index 3747df09a5..39afe99d1f 100644 --- a/pcsx2/gui/Resources/Info.plist.in +++ b/pcsx2/Resources/Info.plist.in @@ -39,7 +39,7 @@ ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHighResolutionCapable - LSApplicationCategoryType + LSApplicationCategoryType public.app-category.games diff --git a/pcsx2/gui/Resources/PCSX2.icns b/pcsx2/Resources/PCSX2.icns similarity index 100% rename from pcsx2/gui/Resources/PCSX2.icns rename to pcsx2/Resources/PCSX2.icns diff --git a/pcsx2/SPU2/Linux/CfgHelpers.cpp b/pcsx2/SPU2/Linux/CfgHelpers.cpp deleted file mode 100644 index 5f3bd622c9..0000000000 --- a/pcsx2/SPU2/Linux/CfgHelpers.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Config.h" -#include "Dialogs.h" -#include "pcsx2/Config.h" -#include "common/Path.h" -#include "gui/StringHelpers.h" -#include - -wxFileConfig* spuConfig = nullptr; -wxString path(L"SPU2.ini"); -bool pathSet = false; - -void initIni() -{ - if (!pathSet) - { - path = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "SPU2.ini")); - pathSet = true; - } - if (spuConfig == nullptr) - spuConfig = new wxFileConfig(L"", L"", path, L"", wxCONFIG_USE_LOCAL_FILE); -} - -void setIni(const wchar_t* Section) -{ - initIni(); - spuConfig->SetPath(wxString::Format(L"/%s", Section)); -} - -void CfgSetSettingsDir(const char* dir) -{ - FileLog("CfgSetSettingsDir(%s)\n", dir); - path = StringUtil::UTF8StringToWxString(Path::Combine((dir == nullptr) ? std::string("inis") : std::string(dir), "SPU2.ini")); - pathSet = true; -} - -void CfgWriteBool(const wchar_t* Section, const wchar_t* Name, bool Value) -{ - setIni(Section); - spuConfig->Write(Name, Value); -} - -void CfgWriteInt(const wchar_t* Section, const wchar_t* Name, int Value) -{ - setIni(Section); - spuConfig->Write(Name, Value); -} - -void CfgWriteFloat(const wchar_t* Section, const wchar_t* Name, float Value) -{ - setIni(Section); - spuConfig->Write(Name, (double)Value); -} - -void CfgWriteStr(const wchar_t* Section, const wchar_t* Name, const wxString& Data) -{ - setIni(Section); - spuConfig->Write(Name, Data); -} - -bool CfgReadBool(const wchar_t* Section, const wchar_t* Name, bool Default) -{ - bool ret; - - setIni(Section); - spuConfig->Read(Name, &ret, Default); - - return ret; -} - -int CfgReadInt(const wchar_t* Section, const wchar_t* Name, int Default) -{ - int ret; - - setIni(Section); - spuConfig->Read(Name, &ret, Default); - - return ret; -} - -float CfgReadFloat(const wchar_t* Section, const wchar_t* Name, float Default) -{ - double ret; - - setIni(Section); - spuConfig->Read(Name, &ret, (double)Default); - - return (float)ret; -} - -void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wchar_t* Data, int DataSize, const wchar_t* Default) -{ - setIni(Section); - wcscpy(Data, spuConfig->Read(Name, Default).wc_str()); -} - -void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, const wchar_t* Default) -{ - setIni(Section); - Data = spuConfig->Read(Name, Default); -} diff --git a/pcsx2/SPU2/Linux/Config.cpp b/pcsx2/SPU2/Linux/Config.cpp deleted file mode 100644 index afd32ec5f2..0000000000 --- a/pcsx2/SPU2/Linux/Config.cpp +++ /dev/null @@ -1,181 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" -#include "Config.h" -#include "gui/StringHelpers.h" - -#if defined(__unix__) || defined(__APPLE__) -#include -#include -#include "SPU2/wx/wxConfig.h" -#endif - -int AutoDMAPlayRate[2] = {0, 0}; - -// Default settings. - -// MIXING -int Interpolation = 5; -/* values: - 0: No interpolation (uses nearest) - 1. Linear interpolation - 2. Cubic interpolation - 3. Hermite interpolation - 4. Catmull-Rom interpolation - 5. Gaussian interpolation -*/ - -float FinalVolume; // global -bool AdvancedVolumeControl; -float VolumeAdjustFLdb; // Decibels settings, because audiophiles love that. -float VolumeAdjustCdb; -float VolumeAdjustFRdb; -float VolumeAdjustBLdb; -float VolumeAdjustBRdb; -float VolumeAdjustSLdb; -float VolumeAdjustSRdb; -float VolumeAdjustLFEdb; -float VolumeAdjustFL; // Linear coefficients calculated from decibels, -float VolumeAdjustC; -float VolumeAdjustFR; -float VolumeAdjustBL; -float VolumeAdjustBR; -float VolumeAdjustSL; -float VolumeAdjustSR; -float VolumeAdjustLFE; - -bool _visual_debug_enabled = false; // Windows-only feature - -// OUTPUT -u32 OutputModule = 0; -int SndOutLatencyMS = 100; -int SynchMode = 0; // Time Stretch, Async or Disabled. - -int numSpeakers = 0; -int dplLevel = 0; -bool temp_debug_state; - -/*****************************************************************************/ - -void ReadSettings() -{ - // For some reason this can be called before we know what ini file we're writing to. - // Let's not try to read it if that happens. - if (!pathSet) - initIni(); - - Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 5); - FinalVolume = ((float)CfgReadInt(L"MIXING", L"FinalVolume", 100)) / 100; - if (FinalVolume > 2.0f) - FinalVolume = 2.0f; - - AdvancedVolumeControl = CfgReadBool(L"MIXING", L"AdvancedVolumeControl", false); - VolumeAdjustCdb = CfgReadFloat(L"MIXING", L"VolumeAdjustC(dB)", 0); - VolumeAdjustFLdb = CfgReadFloat(L"MIXING", L"VolumeAdjustFL(dB)", 0); - VolumeAdjustFRdb = CfgReadFloat(L"MIXING", L"VolumeAdjustFR(dB)", 0); - VolumeAdjustBLdb = CfgReadFloat(L"MIXING", L"VolumeAdjustBL(dB)", 0); - VolumeAdjustBRdb = CfgReadFloat(L"MIXING", L"VolumeAdjustBR(dB)", 0); - VolumeAdjustSLdb = CfgReadFloat(L"MIXING", L"VolumeAdjustSL(dB)", 0); - VolumeAdjustSRdb = CfgReadFloat(L"MIXING", L"VolumeAdjustSR(dB)", 0); - VolumeAdjustLFEdb = CfgReadFloat(L"MIXING", L"VolumeAdjustLFE(dB)", 0); - VolumeAdjustC = powf(10, VolumeAdjustCdb / 10); - VolumeAdjustFL = powf(10, VolumeAdjustFLdb / 10); - VolumeAdjustFR = powf(10, VolumeAdjustFRdb / 10); - VolumeAdjustBL = powf(10, VolumeAdjustBLdb / 10); - VolumeAdjustBR = powf(10, VolumeAdjustBRdb / 10); - VolumeAdjustSL = powf(10, VolumeAdjustSLdb / 10); - VolumeAdjustSR = powf(10, VolumeAdjustSRdb / 10); - VolumeAdjustLFE = powf(10, VolumeAdjustLFEdb / 10); - -#ifdef SPU2X_CUBEB - const SndOutModule* const defaultModule = CubebOut; -#else - const SndOutModule* const defaultModule = NullOut; -#endif - - wxString temp; - CfgReadStr(L"OUTPUT", L"Output_Module", temp, StringUtil::UTF8StringToWxString(defaultModule->GetIdent()).wc_str()); - OutputModule = FindOutputModuleById(temp.ToUTF8()); // Find the driver index of this module... - - SndOutLatencyMS = CfgReadInt(L"OUTPUT", L"Latency", 100); - SynchMode = CfgReadInt(L"OUTPUT", L"Synch_Mode", 0); - numSpeakers = CfgReadInt(L"OUTPUT", L"SpeakerConfiguration", 0); - - SoundtouchCfg::ReadSettings(); - DebugConfig::ReadSettings(); - - // Sanity Checks - // ------------- - - Clampify(SndOutLatencyMS, LATENCY_MIN, LATENCY_MAX); - - if (mods[OutputModule] == nullptr) - { - Console.Warning("* SPU2: Unknown output module '%s' specified in configuration file.", temp.wc_str()); - Console.Warning("* SPU2: Defaulting to %s (%s).", defaultModule->GetLongName(), defaultModule->GetIdent()); - OutputModule = FindOutputModuleById(defaultModule->GetIdent()); - } - - WriteSettings(); - spuConfig->Flush(); -} - -/*****************************************************************************/ - -void WriteSettings() -{ - if (!pathSet) - { - FileLog("Write called without the path set.\n"); - return; - } - - CfgWriteInt(L"MIXING", L"Interpolation", Interpolation); - CfgWriteInt(L"MIXING", L"FinalVolume", (int)(FinalVolume * 100)); - - CfgWriteBool(L"MIXING", L"AdvancedVolumeControl", AdvancedVolumeControl); - CfgWriteFloat(L"MIXING", L"VolumeAdjustC(dB)", VolumeAdjustCdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustFL(dB)", VolumeAdjustFLdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustFR(dB)", VolumeAdjustFRdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustBL(dB)", VolumeAdjustBLdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustBR(dB)", VolumeAdjustBRdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustSL(dB)", VolumeAdjustSLdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustSR(dB)", VolumeAdjustSRdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustLFE(dB)", VolumeAdjustLFEdb); - - CfgWriteStr(L"OUTPUT", L"Output_Module", mods[OutputModule]->GetIdent()); - CfgWriteInt(L"OUTPUT", L"Latency", SndOutLatencyMS); - CfgWriteInt(L"OUTPUT", L"Synch_Mode", SynchMode); - CfgWriteInt(L"OUTPUT", L"SpeakerConfiguration", numSpeakers); - - SoundtouchCfg::WriteSettings(); - DebugConfig::WriteSettings(); -} - -void configure() -{ - auto* dialog = new Dialog; - - initIni(); - ReadSettings(); - dialog->Display(); - WriteSettings(); - delete spuConfig; - spuConfig = nullptr; - wxDELETE(dialog); -} diff --git a/pcsx2/SPU2/Linux/Config.h b/pcsx2/SPU2/Linux/Config.h deleted file mode 100644 index 3bac2dcd7d..0000000000 --- a/pcsx2/SPU2/Linux/Config.h +++ /dev/null @@ -1,117 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef CONFIG_H_INCLUDED -#define CONFIG_H_INCLUDED - -#include -#include - -extern bool DebugEnabled; - -extern bool _MsgToConsole; -extern bool _MsgKeyOnOff; -extern bool _MsgVoiceOff; -extern bool _MsgDMA; -extern bool _MsgAutoDMA; -extern bool _MsgOverruns; -extern bool _MsgCache; - -extern bool _AccessLog; -extern bool _DMALog; -extern bool _WaveLog; - -extern bool _CoresDump; -extern bool _MemDump; -extern bool _RegDump; -extern bool _visual_debug_enabled; - -/*static __forceinline bool MsgToConsole() { return _MsgToConsole & DebugEnabled; } - -static __forceinline bool MsgKeyOnOff() { return _MsgKeyOnOff & MsgToConsole(); } -static __forceinline bool MsgVoiceOff() { return _MsgVoiceOff & MsgToConsole(); } -static __forceinline bool MsgDMA() { return _MsgDMA & MsgToConsole(); } -static __forceinline bool MsgAutoDMA() { return _MsgAutoDMA & MsgDMA(); } -static __forceinline bool MsgOverruns() { return _MsgOverruns & MsgToConsole(); } -static __forceinline bool MsgCache() { return _MsgCache & MsgToConsole(); } - -static __forceinline bool AccessLog() { return _AccessLog & DebugEnabled; } -static __forceinline bool DMALog() { return _DMALog & DebugEnabled; } -static __forceinline bool WaveLog() { return _WaveLog & DebugEnabled; } - -static __forceinline bool CoresDump() { return _CoresDump & DebugEnabled; } -static __forceinline bool MemDump() { return _MemDump & DebugEnabled; } -static __forceinline bool RegDump() { return _RegDump & DebugEnabled; }*/ - - -//extern wchar_t AccessLogFileName[255]; -//extern wchar_t WaveLogFileName[255]; -//extern wchar_t DMA4LogFileName[255]; -//extern wchar_t DMA7LogFileName[255]; -//extern wchar_t CoresDumpFileName[255]; -//extern wchar_t MemDumpFileName[255]; -//extern wchar_t RegDumpFileName[255]; - -extern int Interpolation; -extern float FinalVolume; - -extern int AutoDMAPlayRate[2]; - -extern u32 OutputModule; -extern int SndOutLatencyMS; - -extern wchar_t dspPlugin[]; -extern int dspPluginModule; - -extern bool dspPluginEnabled; -extern int SynchMode; - -#ifdef PCSX2_DEVBUILD -const int LATENCY_MAX = 3000; -#else -const int LATENCY_MAX = 200; -#endif - -const int LATENCY_MIN = 3; -const int LATENCY_MIN_TIMESTRETCH = 15; - -namespace SoundtouchCfg -{ - extern const int SequenceLen_Min; - extern const int SequenceLen_Max; - - extern const int SeekWindow_Min; - extern const int SeekWindow_Max; - - extern const int Overlap_Min; - extern const int Overlap_Max; - - extern int SequenceLenMS; - extern int SeekWindowMS; - extern int OverlapMS; - - void ReadSettings(); - void WriteSettings(); -}; // namespace SoundtouchCfg - -void ReadSettings(); -void WriteSettings(); -void DisplayDialog(); - -void configure(); -extern wxFileConfig* spuConfig; -extern bool pathSet; -extern void initIni(); -#endif // CONFIG_H_INCLUDED diff --git a/pcsx2/SPU2/Linux/ConfigDebug.cpp b/pcsx2/SPU2/Linux/ConfigDebug.cpp deleted file mode 100644 index a2fa78da88..0000000000 --- a/pcsx2/SPU2/Linux/ConfigDebug.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" -#include "Config.h" -#include "pcsx2/Config.h" -#include "gui/StringHelpers.h" -#include "gui/wxDirName.h" -#include "common/FileSystem.h" -#include "common/StringUtil.h" -#include "common/Path.h" - -bool DebugEnabled = false; -bool _MsgToConsole = false; -bool _MsgKeyOnOff = false; -bool _MsgVoiceOff = false; -bool _MsgDMA = false; -bool _MsgAutoDMA = false; -bool _MsgOverruns = false; -bool _MsgCache = false; - -bool _AccessLog = false; -bool _DMALog = false; -bool _WaveLog = false; - -bool _CoresDump = false; -bool _MemDump = false; -bool _RegDump = false; - -// this is set true if PCSX2 invokes the SetLogDir callback, which tells SPU2 to use that over -// the configured crap in the ini file. -static bool LogLocationSetByPcsx2 = false; - -static wxDirName LogsFolder; -static wxDirName DumpsFolder; - -std::string AccessLogFileName; -std::string WaveLogFileName; -std::string DMA4LogFileName; -std::string DMA7LogFileName; - -std::string CoresDumpFileName; -std::string MemDumpFileName; -std::string RegDumpFileName; - -void CfgSetLogDir(const char* dir) -{ - LogsFolder = (dir == nullptr) ? wxString(L"logs") : wxString(dir, wxConvFile); - DumpsFolder = (dir == nullptr) ? wxString(L"logs") : wxString(dir, wxConvFile); - LogLocationSetByPcsx2 = (dir != nullptr); -} - -FILE* OpenBinaryLog(const char* logfile) -{ - return FileSystem::OpenCFile(Path::Combine(EmuFolders::Logs, logfile).c_str(), "wb"); -} - -FILE* OpenLog(const char* logfile) -{ - return FileSystem::OpenCFile(Path::Combine(EmuFolders::Logs, logfile).c_str(), "w"); -} - -FILE* OpenDump(const char* logfile) -{ - return FileSystem::OpenCFile(Path::Combine(EmuFolders::Logs, logfile).c_str(), "w"); -} - -namespace DebugConfig -{ - static const wchar_t* Section = L"DEBUG"; - - static void set_default_filenames() - { - AccessLogFileName = "SPU2Log.txt"; - WaveLogFileName = "SPU2log.wav"; - DMA4LogFileName = "SPU2dma4.dat"; - DMA7LogFileName = "SPU2dma7.dat"; - - CoresDumpFileName = "SPU2Cores.txt"; - MemDumpFileName = "SPU2mem.dat"; - RegDumpFileName = "SPU2regs.dat"; - } - - void ReadSettings() - { - DebugEnabled = CfgReadBool(Section, L"Global_Enable", 0); - _MsgToConsole = CfgReadBool(Section, L"Show_Messages", 0); - _MsgKeyOnOff = CfgReadBool(Section, L"Show_Messages_Key_On_Off", 0); - _MsgVoiceOff = CfgReadBool(Section, L"Show_Messages_Voice_Off", 0); - _MsgDMA = CfgReadBool(Section, L"Show_Messages_DMA_Transfer", 0); - _MsgAutoDMA = CfgReadBool(Section, L"Show_Messages_AutoDMA", 0); - _MsgOverruns = CfgReadBool(Section, L"Show_Messages_Overruns", 0); - _MsgCache = CfgReadBool(Section, L"Show_Messages_CacheStats", 0); - - _AccessLog = CfgReadBool(Section, L"Log_Register_Access", 0); - _DMALog = CfgReadBool(Section, L"Log_DMA_Transfers", 0); - _WaveLog = CfgReadBool(Section, L"Log_WAVE_Output", 0); - - _CoresDump = CfgReadBool(Section, L"Dump_Info", 0); - _MemDump = CfgReadBool(Section, L"Dump_Memory", 0); - _RegDump = CfgReadBool(Section, L"Dump_Regs", 0); - - set_default_filenames(); - - wxString wxAccessLogFileName; - wxString wxWaveLogFileName; - wxString wxDMA4LogFileName; - wxString wxDMA7LogFileName; - wxString wxCoresDumpFileName; - wxString wxMemDumpFileName; - wxString wxRegDumpFileName; - CfgReadStr(Section, L"Access_Log_Filename", wxAccessLogFileName, L"SPU2Log.txt"); - CfgReadStr(Section, L"DMA4Log_Filename", wxDMA4LogFileName, L"SPU2dma4.dat"); - CfgReadStr(Section, L"WaveLog_Filename", wxWaveLogFileName, L"logs/SPU2log.wav"); - CfgReadStr(Section, L"DMA7Log_Filename", wxDMA7LogFileName, L"SPU2dma7.dat"); - - CfgReadStr(Section, L"Info_Dump_Filename", wxCoresDumpFileName, L"SPU2Cores.txt"); - CfgReadStr(Section, L"Mem_Dump_Filename", wxMemDumpFileName, L"SPU2mem.dat"); - CfgReadStr(Section, L"Reg_Dump_Filename", wxRegDumpFileName, L"SPU2regs.dat"); - - AccessLogFileName = StringUtil::wxStringToUTF8String(wxAccessLogFileName); - WaveLogFileName = StringUtil::wxStringToUTF8String(wxAccessLogFileName); - DMA4LogFileName = StringUtil::wxStringToUTF8String(wxDMA4LogFileName); - DMA7LogFileName = StringUtil::wxStringToUTF8String(wxDMA7LogFileName); - CoresDumpFileName = StringUtil::wxStringToUTF8String(wxCoresDumpFileName); - MemDumpFileName = StringUtil::wxStringToUTF8String(wxMemDumpFileName); - RegDumpFileName = StringUtil::wxStringToUTF8String(wxRegDumpFileName); - } - - - void WriteSettings() - { - CfgWriteBool(Section, L"Global_Enable", DebugEnabled); - - CfgWriteBool(Section, L"Show_Messages", _MsgToConsole); - CfgWriteBool(Section, L"Show_Messages_Key_On_Off", _MsgKeyOnOff); - CfgWriteBool(Section, L"Show_Messages_Voice_Off", _MsgVoiceOff); - CfgWriteBool(Section, L"Show_Messages_DMA_Transfer", _MsgDMA); - CfgWriteBool(Section, L"Show_Messages_AutoDMA", _MsgAutoDMA); - CfgWriteBool(Section, L"Show_Messages_Overruns", _MsgOverruns); - CfgWriteBool(Section, L"Show_Messages_CacheStats", _MsgCache); - - CfgWriteBool(Section, L"Log_Register_Access", _AccessLog); - CfgWriteBool(Section, L"Log_DMA_Transfers", _DMALog); - CfgWriteBool(Section, L"Log_WAVE_Output", _WaveLog); - - CfgWriteBool(Section, L"Dump_Info", _CoresDump); - CfgWriteBool(Section, L"Dump_Memory", _MemDump); - CfgWriteBool(Section, L"Dump_Regs", _RegDump); - - set_default_filenames(); - CfgWriteStr(Section, L"Access_Log_Filename", StringUtil::UTF8StringToWxString(AccessLogFileName)); - CfgWriteStr(Section, L"WaveLog_Filename", StringUtil::UTF8StringToWxString(WaveLogFileName)); - CfgWriteStr(Section, L"DMA4Log_Filename", StringUtil::UTF8StringToWxString(DMA4LogFileName)); - CfgWriteStr(Section, L"DMA7Log_Filename", StringUtil::UTF8StringToWxString(DMA7LogFileName)); - - CfgWriteStr(Section, L"Info_Dump_Filename", StringUtil::UTF8StringToWxString(CoresDumpFileName)); - CfgWriteStr(Section, L"Mem_Dump_Filename", StringUtil::UTF8StringToWxString(MemDumpFileName)); - CfgWriteStr(Section, L"Reg_Dump_Filename", StringUtil::UTF8StringToWxString(RegDumpFileName)); - } - -} // namespace DebugConfig diff --git a/pcsx2/SPU2/Linux/ConfigSoundTouch.cpp b/pcsx2/SPU2/Linux/ConfigSoundTouch.cpp deleted file mode 100644 index f9a2e39c0d..0000000000 --- a/pcsx2/SPU2/Linux/ConfigSoundTouch.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" -#include "Config.h" -#include "SoundTouch.h" - -namespace SoundtouchCfg -{ - // Timestretch Slider Bounds, Min/Max - const int SequenceLen_Min = 20; - const int SequenceLen_Max = 100; - - const int SeekWindow_Min = 10; - const int SeekWindow_Max = 30; - - const int Overlap_Min = 5; - const int Overlap_Max = 15; - - int SequenceLenMS = 30; - int SeekWindowMS = 20; - int OverlapMS = 10; - - static void ClampValues() - { - Clampify(SequenceLenMS, SequenceLen_Min, SequenceLen_Max); - Clampify(SeekWindowMS, SeekWindow_Min, SeekWindow_Max); - Clampify(OverlapMS, Overlap_Min, Overlap_Max); - } - - void ApplySettings(soundtouch::SoundTouch& sndtouch) - { - sndtouch.setSetting(SETTING_SEQUENCE_MS, SequenceLenMS); - sndtouch.setSetting(SETTING_SEEKWINDOW_MS, SeekWindowMS); - sndtouch.setSetting(SETTING_OVERLAP_MS, OverlapMS); - } - - void ReadSettings() - { - SequenceLenMS = CfgReadInt(L"SOUNDTOUCH", L"SequenceLengthMS", 30); - SeekWindowMS = CfgReadInt(L"SOUNDTOUCH", L"SeekWindowMS", 20); - OverlapMS = CfgReadInt(L"SOUNDTOUCH", L"OverlapMS", 10); - - ClampValues(); - WriteSettings(); - } - - void WriteSettings() - { - CfgWriteInt(L"SOUNDTOUCH", L"SequenceLengthMS", SequenceLenMS); - CfgWriteInt(L"SOUNDTOUCH", L"SeekWindowMS", SeekWindowMS); - CfgWriteInt(L"SOUNDTOUCH", L"OverlapMS", OverlapMS); - } - -} // namespace SoundtouchCfg diff --git a/pcsx2/SPU2/Linux/Dialogs.cpp b/pcsx2/SPU2/Linux/Dialogs.cpp deleted file mode 100644 index 945fd786b1..0000000000 --- a/pcsx2/SPU2/Linux/Dialogs.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -// To be continued... - -#include "PrecompiledHeader.h" -#include "Dialogs.h" -#include - -#if defined(__unix__) || defined(__APPLE__) -#include - -void SysMessage(const char* fmt, ...) -{ - va_list list; - char msg[512]; - - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); - - if (msg[strlen(msg) - 1] == '\n') - msg[strlen(msg) - 1] = 0; - - wxMessageDialog dialog(nullptr, msg, "Info", wxOK); - dialog.ShowModal(); -} - -void SysMessage(const wchar_t* fmt, ...) -{ - va_list list; - va_start(list, fmt); - wxString msg; - msg.PrintfV(fmt, list); - va_end(list); - - wxMessageDialog dialog(nullptr, msg, "Info", wxOK); - dialog.ShowModal(); -} -#endif - -void DspUpdate() -{ -} - -s32 DspLoadLibrary(wchar_t* fileName, int modnum) -{ - return 0; -} diff --git a/pcsx2/SPU2/Linux/Dialogs.h b/pcsx2/SPU2/Linux/Dialogs.h deleted file mode 100644 index 3176931116..0000000000 --- a/pcsx2/SPU2/Linux/Dialogs.h +++ /dev/null @@ -1,42 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#ifndef DIALOG_H_INCLUDED -#define DIALOG_H_INCLUDED - -#include "SPU2/Global.h" -#include "SPU2/Config.h" - -namespace DebugConfig -{ - extern void ReadSettings(); - extern void WriteSettings(); -} // namespace DebugConfig - -extern void CfgSetSettingsDir(const char* dir); -extern void CfgSetLogDir(const char* dir); - -extern void CfgWriteBool(const wchar_t* Section, const wchar_t* Name, bool Value); -extern void CfgWriteInt(const wchar_t* Section, const wchar_t* Name, int Value); -extern void CfgWriteFloat(const wchar_t* Section, const wchar_t* Name, float Value); -extern void CfgWriteStr(const wchar_t* Section, const wchar_t* Name, const wxString& Data); - -extern bool CfgReadBool(const wchar_t* Section, const wchar_t* Name, bool Default); -extern void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, const wchar_t* Default); -//extern void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wchar_t* Data, int DataSize, const wchar_t* Default); -extern int CfgReadInt(const wchar_t* Section, const wchar_t* Name, int Default); -extern float CfgReadFloat(const wchar_t* Section, const wchar_t* Name, float Default); - -#endif diff --git a/pcsx2/SPU2/Windows/CfgHelpers.cpp b/pcsx2/SPU2/Windows/CfgHelpers.cpp deleted file mode 100644 index 8211ae41b0..0000000000 --- a/pcsx2/SPU2/Windows/CfgHelpers.cpp +++ /dev/null @@ -1,220 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Config.h" -#include "SPU2/Global.h" -#include "Dialogs.h" -#include "common/StringUtil.h" -#include "gui/StringHelpers.h" - -void SysMessage(const char* fmt, ...) -{ - va_list list; - char tmp[512]; - wchar_t wtmp[512]; - - va_start(list, fmt); - vsprintf_s(tmp, fmt, list); - va_end(list); - swprintf_s(wtmp, L"%S", tmp); - - // TODO: Move this into app/host. - MessageBox(NULL, wtmp, L"SPU2 System Message", MB_OK | MB_SETFOREGROUND); -} - -void SysMessage(const wchar_t* fmt, ...) -{ - va_list list; - va_start(list, fmt); - wxString wtmp; - wtmp.PrintfV(fmt, list); - va_end(list); - MessageBox(NULL, wtmp, L"SPU2 System Message", MB_OK | MB_SETFOREGROUND); -} - -////// - -#include "common/Path.h" - -wxString CfgFile(L"SPU2.ini"); -bool pathSet = false; - -void initIni() -{ - if (!pathSet) - { - CfgFile = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "SPU2.ini")); - pathSet = true; - } -} - -void CfgSetSettingsDir(const char* dir) -{ - initIni(); -} - - -/*| Config File Format: |¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯*\ -+--+---------------------+------------------------+ -| | -| Option=Value | -| | -| | -| Boolean Values: TRUE,YES,1,T,Y mean 'true', | -| everything else means 'false'. | -| | -| All Values are limited to 255 chars. | -| | -+-------------------------------------------------+ -\*_____________________________________________*/ - - -void CfgWriteBool(const TCHAR* Section, const TCHAR* Name, bool Value) -{ - initIni(); - const TCHAR* Data = Value ? L"TRUE" : L"FALSE"; - WritePrivateProfileString(Section, Name, Data, CfgFile); -} - -void CfgWriteInt(const TCHAR* Section, const TCHAR* Name, int Value) -{ - initIni(); - TCHAR Data[32]; - _itow(Value, Data, 10); - WritePrivateProfileString(Section, Name, Data, CfgFile); -} - -void CfgWriteFloat(const TCHAR* Section, const TCHAR* Name, float Value) -{ - initIni(); - TCHAR Data[32]; - _swprintf(Data, L"%f", Value); - WritePrivateProfileString(Section, Name, Data, CfgFile); -} - -/*void CfgWriteStr(const TCHAR* Section, const TCHAR* Name, const TCHAR *Data) -{ -WritePrivateProfileString( Section, Name, Data, CfgFile ); -}*/ - -void CfgWriteStr(const TCHAR* Section, const TCHAR* Name, const wxString& Data) -{ - initIni(); - WritePrivateProfileString(Section, Name, Data, CfgFile); -} - -/*****************************************************************************/ - -bool CfgReadBool(const TCHAR* Section, const TCHAR* Name, bool Default) -{ - initIni(); - TCHAR Data[255] = {0}; - - GetPrivateProfileString(Section, Name, L"", Data, 255, CfgFile); - Data[254] = 0; - if (wcslen(Data) == 0) - { - CfgWriteBool(Section, Name, Default); - return Default; - } - - if (wcscmp(Data, L"1") == 0) - return true; - if (wcscmp(Data, L"Y") == 0) - return true; - if (wcscmp(Data, L"T") == 0) - return true; - if (wcscmp(Data, L"YES") == 0) - return true; - if (wcscmp(Data, L"TRUE") == 0) - return true; - return false; -} - - -int CfgReadInt(const TCHAR* Section, const TCHAR* Name, int Default) -{ - initIni(); - TCHAR Data[255] = {0}; - GetPrivateProfileString(Section, Name, L"", Data, 255, CfgFile); - Data[254] = 0; - - if (wcslen(Data) == 0) - { - CfgWriteInt(Section, Name, Default); - return Default; - } - - return _wtoi(Data); -} - -float CfgReadFloat(const TCHAR* Section, const TCHAR* Name, float Default) -{ - initIni(); - TCHAR Data[255] = {0}; - GetPrivateProfileString(Section, Name, L"", Data, 255, CfgFile); - Data[254] = 0; - - if (wcslen(Data) == 0) - { - CfgWriteFloat(Section, Name, Default); - return Default; - } - - return (float)_wtof(Data); -} - -void CfgReadStr(const TCHAR* Section, const TCHAR* Name, TCHAR* Data, int DataSize, const TCHAR* Default) -{ - initIni(); - GetPrivateProfileString(Section, Name, L"", Data, DataSize, CfgFile); - - if (wcslen(Data) == 0) - { - swprintf_s(Data, DataSize, L"%s", Default); - CfgWriteStr(Section, Name, Data); - } -} - -void CfgReadStr(const TCHAR* Section, const TCHAR* Name, wxString& Data, const TCHAR* Default) -{ - initIni(); - wchar_t workspace[512]; - GetPrivateProfileString(Section, Name, L"", workspace, std::size(workspace), CfgFile); - - Data = workspace; - - if (Data.empty()) - { - Data = Default; - CfgWriteStr(Section, Name, Default); - } -} - -// Tries to read the requested value. -// Returns FALSE if the value isn't found. -bool CfgFindName(const TCHAR* Section, const TCHAR* Name) -{ - initIni(); - // Only load 24 characters. No need to load more. - TCHAR Data[24] = {0}; - GetPrivateProfileString(Section, Name, L"", Data, 24, CfgFile); - Data[23] = 0; - - if (wcslen(Data) == 0) - return false; - return true; -} diff --git a/pcsx2/SPU2/Windows/Config.cpp b/pcsx2/SPU2/Windows/Config.cpp deleted file mode 100644 index 209a9581b9..0000000000 --- a/pcsx2/SPU2/Windows/Config.cpp +++ /dev/null @@ -1,533 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" -#include "common/StringUtil.h" - -#ifdef PCSX2_DEVBUILD -static const int LATENCY_MAX = 3000; -#else -static const int LATENCY_MAX = 200; -#endif - -static const int LATENCY_MIN = 3; -static const int LATENCY_MIN_TS = 15; - -// MIXING -int Interpolation = 5; -/* values: - 0: No interpolation (uses nearest) - 1. Linear interpolation - 2. Cubic interpolation - 3. Hermite interpolation - 4. Catmull-Rom interpolation - 5. Gaussian interpolation -*/ - -float FinalVolume; // Global -bool AdvancedVolumeControl; -float VolumeAdjustFLdb; // Decibels settings, because audiophiles love that. -float VolumeAdjustCdb; -float VolumeAdjustFRdb; -float VolumeAdjustBLdb; -float VolumeAdjustBRdb; -float VolumeAdjustSLdb; -float VolumeAdjustSRdb; -float VolumeAdjustLFEdb; -float VolumeAdjustFL; // Linear coefficients calculated from decibels, -float VolumeAdjustC; -float VolumeAdjustFR; -float VolumeAdjustBL; -float VolumeAdjustBR; -float VolumeAdjustSL; -float VolumeAdjustSR; -float VolumeAdjustLFE; - -// OUTPUT -int SndOutLatencyMS = 100; -int SynchMode = 0; // Time Stretch, Async or Disabled. - -u32 OutputModule = 0; - -CONFIG_XAUDIO2 Config_XAudio2; - -// DSP -bool dspPluginEnabled = false; -int dspPluginModule = 0; -wchar_t dspPlugin[256]; - -int numSpeakers = 0; - -int dplLevel = 0; - -/*****************************************************************************/ - -void ReadSettings() -{ - Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 5); - - FinalVolume = ((float)CfgReadInt(L"MIXING", L"FinalVolume", 100)) / 100; - if (FinalVolume > 2.0f) - FinalVolume = 2.0f; - - AdvancedVolumeControl = CfgReadBool(L"MIXING", L"AdvancedVolumeControl", false); - VolumeAdjustCdb = CfgReadFloat(L"MIXING", L"VolumeAdjustC(dB)", 0); - VolumeAdjustFLdb = CfgReadFloat(L"MIXING", L"VolumeAdjustFL(dB)", 0); - VolumeAdjustFRdb = CfgReadFloat(L"MIXING", L"VolumeAdjustFR(dB)", 0); - VolumeAdjustBLdb = CfgReadFloat(L"MIXING", L"VolumeAdjustBL(dB)", 0); - VolumeAdjustBRdb = CfgReadFloat(L"MIXING", L"VolumeAdjustBR(dB)", 0); - VolumeAdjustSLdb = CfgReadFloat(L"MIXING", L"VolumeAdjustSL(dB)", 0); - VolumeAdjustSRdb = CfgReadFloat(L"MIXING", L"VolumeAdjustSR(dB)", 0); - VolumeAdjustLFEdb = CfgReadFloat(L"MIXING", L"VolumeAdjustLFE(dB)", 0); - VolumeAdjustC = powf(10, VolumeAdjustCdb / 10); - VolumeAdjustFL = powf(10, VolumeAdjustFLdb / 10); - VolumeAdjustFR = powf(10, VolumeAdjustFRdb / 10); - VolumeAdjustBL = powf(10, VolumeAdjustBLdb / 10); - VolumeAdjustBR = powf(10, VolumeAdjustBRdb / 10); - VolumeAdjustSL = powf(10, VolumeAdjustSLdb / 10); - VolumeAdjustSR = powf(10, VolumeAdjustSRdb / 10); - VolumeAdjustLFE = powf(10, VolumeAdjustLFEdb / 10); - - SynchMode = CfgReadInt(L"OUTPUT", L"Synch_Mode", 0); - numSpeakers = CfgReadInt(L"OUTPUT", L"SpeakerConfiguration", 0); - dplLevel = CfgReadInt(L"OUTPUT", L"DplDecodingLevel", 0); - SndOutLatencyMS = CfgReadInt(L"OUTPUT", L"Latency", 100); - - if ((SynchMode == 0) && (SndOutLatencyMS < LATENCY_MIN_TS)) // Can't use low-latency with timestretcher at the moment. - SndOutLatencyMS = LATENCY_MIN_TS; - else if (SndOutLatencyMS < LATENCY_MIN) - SndOutLatencyMS = LATENCY_MIN; - - wchar_t omodid[128]; - - // Portaudio occasionally has issues selecting the proper default audio device. - // Let's use xaudio2 until this is sorted (rama). - - // CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, PortaudioOut->GetIdent()); - CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, StringUtil::UTF8StringToWideString(CubebOut->GetIdent()).c_str()); - - // Find the driver index of this module: - OutputModule = FindOutputModuleById(StringUtil::WideStringToUTF8String(omodid).c_str()); - - CfgReadStr(L"DSP PLUGIN", L"Filename", dspPlugin, 255, L""); - dspPluginModule = CfgReadInt(L"DSP PLUGIN", L"ModuleNum", 0); - dspPluginEnabled = CfgReadBool(L"DSP PLUGIN", L"Enabled", false); - - SoundtouchCfg::ReadSettings(); - DebugConfig::ReadSettings(); - - // Sanity Checks - // ------------- - - Clampify(SndOutLatencyMS, LATENCY_MIN, LATENCY_MAX); - - if (mods[OutputModule] == nullptr) - { - // Unsupported or legacy module. - Console.Warning("* SPU2: Unknown output module '%s' specified in configuration file.", omodid); - Console.Warning("* SPU2: Defaulting to XAudio (%s).", XAudio2Out->GetIdent()); - OutputModule = FindOutputModuleById(XAudio2Out->GetIdent()); - } -} - -/*****************************************************************************/ - -void WriteSettings() -{ - CfgWriteInt(L"MIXING", L"Interpolation", Interpolation); - - CfgWriteInt(L"MIXING", L"FinalVolume", (int)(FinalVolume * 100)); - - CfgWriteBool(L"MIXING", L"AdvancedVolumeControl", AdvancedVolumeControl); - CfgWriteFloat(L"MIXING", L"VolumeAdjustC(dB)", VolumeAdjustCdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustFL(dB)", VolumeAdjustFLdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustFR(dB)", VolumeAdjustFRdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustBL(dB)", VolumeAdjustBLdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustBR(dB)", VolumeAdjustBRdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustSL(dB)", VolumeAdjustSLdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustSR(dB)", VolumeAdjustSRdb); - CfgWriteFloat(L"MIXING", L"VolumeAdjustLFE(dB)", VolumeAdjustLFEdb); - - CfgWriteStr(L"OUTPUT", L"Output_Module", mods[OutputModule]->GetIdent()); - CfgWriteInt(L"OUTPUT", L"Latency", SndOutLatencyMS); - CfgWriteInt(L"OUTPUT", L"Synch_Mode", SynchMode); - CfgWriteInt(L"OUTPUT", L"SpeakerConfiguration", numSpeakers); - CfgWriteInt(L"OUTPUT", L"DplDecodingLevel", dplLevel); - - CfgWriteStr(L"DSP PLUGIN", L"Filename", dspPlugin); - CfgWriteInt(L"DSP PLUGIN", L"ModuleNum", dspPluginModule); - CfgWriteBool(L"DSP PLUGIN", L"Enabled", dspPluginEnabled); - - SoundtouchCfg::WriteSettings(); - DebugConfig::WriteSettings(); -} - -void CheckOutputModule(HWND window) -{ - OutputModule = SendMessage(GetDlgItem(window, IDC_OUTPUT), CB_GETCURSEL, 0, 0); - const bool IsConfigurable = mods[OutputModule] == CubebOut; - const bool AudioExpansion = - mods[OutputModule] == XAudio2Out || - mods[OutputModule] == CubebOut; - - EnableWindow(GetDlgItem(window, IDC_OUTCONF), IsConfigurable); - EnableWindow(GetDlgItem(window, IDC_SPEAKERS), AudioExpansion); - EnableWindow(GetDlgItem(window, IDC_SPEAKERS_TEXT), AudioExpansion); -} - -static BOOL CALLBACK CubebConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - switch (uMsg) - { - case WM_INITDIALOG: - { - static constexpr wchar_t* cubeb_backend_names[][2] = { - {L"Unspecified", L""}, - {L"WASAPI", L"wasapi"}, - {L"WinMM", L"winmm"}}; - - const bool minimalLatency = CfgReadBool(L"Cubeb", L"MinimalSuggestedLatency", false); - const int suggestedLatencyMS = CfgReadInt(L"Cubeb", L"ManualSuggestedLatencyMS", 20); - wxString backend; - CfgReadStr(L"Cubeb", L"BackendName", backend, L""); - - SendMessage(GetDlgItem(hWnd, IDC_BACKEND), CB_RESETCONTENT, 0, 0); - - for (size_t i = 0; i < std::size(cubeb_backend_names); i++) - { - SendMessageW(GetDlgItem(hWnd, IDC_BACKEND), CB_ADDSTRING, (WPARAM)i, (LPARAM)cubeb_backend_names[i][0]); - SendMessageW(GetDlgItem(hWnd, IDC_BACKEND), CB_SETITEMDATA, (WPARAM)i, (LPARAM)cubeb_backend_names[i][1]); - if (backend == cubeb_backend_names[i][1]) - SendMessage(GetDlgItem(hWnd, IDC_BACKEND), CB_SETCURSEL, (WPARAM)i, 0); - } - - INIT_SLIDER(IDC_LATENCY, 10, 200, 10, 1, 1); - SendMessage(GetDlgItem(hWnd, IDC_LATENCY), TBM_SETPOS, TRUE, suggestedLatencyMS); - - wchar_t temp[128]; - swprintf_s(temp, L"%d ms", suggestedLatencyMS); - SetWindowText(GetDlgItem(hWnd, IDC_LATENCY_LABEL), temp); - - if (minimalLatency) - SET_CHECK(IDC_MINIMIZE, true); - else - SET_CHECK(IDC_MANUAL, true); - - return TRUE; - } - break; - - case WM_COMMAND: - { - const DWORD wmId = LOWORD(wParam); - const DWORD wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - { - int idx = (int)SendMessage(GetDlgItem(hWnd, IDC_BACKEND), CB_GETCURSEL, 0, 0); - const wchar_t* backend = (const wchar_t*)SendMessage(GetDlgItem(hWnd, IDC_BACKEND), CB_GETITEMDATA, idx, 0); - CfgWriteStr(L"Cubeb", L"BackendName", backend); - - const int suggestedLatencyMS = (int)SendMessage(GetDlgItem(hWnd, IDC_LATENCY), TBM_GETPOS, 0, 0); - const bool minimalLatency = SendMessage(GetDlgItem(hWnd, IDC_MINIMIZE), BM_GETCHECK, 0, 0) == BST_CHECKED; - CfgWriteBool(L"Cubeb", L"MinimalSuggestedLatency", minimalLatency); - CfgWriteInt(L"Cubeb", L"ManualSuggestedLatencyMS", suggestedLatencyMS); - - EndDialog(hWnd, 0); - return TRUE; - } - break; - - case IDCANCEL: - EndDialog(hWnd, 0); - return TRUE; - - default: - return FALSE; - } - } - break; - - case WM_HSCROLL: - { - const DWORD wmId = LOWORD(wParam); - DWORD wmEvent = HIWORD(wParam); - switch (wmId) - { - case TB_LINEUP: - case TB_LINEDOWN: - case TB_PAGEUP: - case TB_PAGEDOWN: - case TB_TOP: - case TB_BOTTOM: - wmEvent = (int)SendMessage((HWND)lParam, TBM_GETPOS, 0, 0); - case TB_THUMBPOSITION: - case TB_THUMBTRACK: - { - wchar_t temp[128]; - if (wmEvent < 10) - wmEvent = 10; - if (wmEvent > 200) - wmEvent = 200; - SendMessage((HWND)lParam, TBM_SETPOS, TRUE, wmEvent); - swprintf_s(temp, L"%d ms", wmEvent); - SetWindowText(GetDlgItem(hWnd, IDC_LATENCY_LABEL), temp); - break; - } - default: - return FALSE; - } - - return TRUE; - } - break; - - default: - return FALSE; - } - return FALSE; -} - -BOOL CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - int wmId, wmEvent; - wchar_t temp[384] = {0}; - - switch (uMsg) - { - case WM_PAINT: - return FALSE; - - case WM_INITDIALOG: - { - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_RESETCONTENT, 0, 0); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"0 - Nearest (Fastest / worst quality)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"1 - Linear (Simple / okay sound)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"2 - Cubic (Fake highs / okay sound)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"3 - Hermite (Better highs / okay sound)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"4 - Catmull-Rom (PS2-like / good sound)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"5 - Gaussian (PS2-like / great sound)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_SETCURSEL, Interpolation, 0); - - SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_RESETCONTENT, 0, 0); - SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_ADDSTRING, 0, (LPARAM)L"TimeStretch (Recommended)"); - SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_ADDSTRING, 0, (LPARAM)L"Async Mix (Breaks some games!)"); - SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_ADDSTRING, 0, (LPARAM)L"None (Audio can skip.)"); - SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_SETCURSEL, SynchMode, 0); - - SendDialogMsg(hWnd, IDC_SPEAKERS, CB_RESETCONTENT, 0, 0); - SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Stereo (None, Default)"); - SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Quadrafonic"); - SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Surround 5.1"); - SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Surround 7.1"); - SendDialogMsg(hWnd, IDC_SPEAKERS, CB_SETCURSEL, numSpeakers, 0); - - SendDialogMsg(hWnd, IDC_OUTPUT, CB_RESETCONTENT, 0, 0); - - int modidx = 0; - while (mods[modidx] != nullptr) - { - swprintf_s(temp, 72, L"%d - %s", modidx, StringUtil::UTF8StringToWideString(mods[modidx]->GetLongName()).c_str()); - SendDialogMsg(hWnd, IDC_OUTPUT, CB_ADDSTRING, 0, (LPARAM)temp); - ++modidx; - } - SendDialogMsg(hWnd, IDC_OUTPUT, CB_SETCURSEL, OutputModule, 0); - - float minlat = (SynchMode == 0) ? LATENCY_MIN_TS : LATENCY_MIN; - int minexp = (int)(pow(minlat + 1, 1.0 / 3.0) * 128.0); - int maxexp = (int)(pow((float)LATENCY_MAX + 1, 1.0 / 3.0) * 128.0); - INIT_SLIDER(IDC_LATENCY_SLIDER, minexp, maxexp, 54, 10, 11); - - SendDialogMsg(hWnd, IDC_LATENCY_SLIDER, TBM_SETPOS, TRUE, (int)((pow((float)SndOutLatencyMS, 1.0 / 3.0) * 128.0) + 1)); - swprintf_s(temp, L"%d ms (avg)", SndOutLatencyMS); - SetWindowText(GetDlgItem(hWnd, IDC_LATENCY_LABEL), temp); - - int configvol = (int)(FinalVolume * 100); - INIT_SLIDER(IDC_VOLUME_SLIDER, 0, 200, 10, 5, 1); - - SendDialogMsg(hWnd, IDC_VOLUME_SLIDER, TBM_SETPOS, TRUE, configvol); - swprintf_s(temp, L"%d%%", configvol); - SetWindowText(GetDlgItem(hWnd, IDC_VOLUME_LABEL), temp); - - CheckOutputModule(hWnd); - - EnableWindow(GetDlgItem(hWnd, IDC_OPEN_CONFIG_SOUNDTOUCH), (SynchMode == 0)); - EnableWindow(GetDlgItem(hWnd, IDC_OPEN_CONFIG_DEBUG), DebugEnabled); - - SET_CHECK(IDC_DEBUG_ENABLE, DebugEnabled); - SET_CHECK(IDC_DSP_ENABLE, dspPluginEnabled); - } - break; - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - { - float res = ((int)SendDialogMsg(hWnd, IDC_LATENCY_SLIDER, TBM_GETPOS, 0, 0)) / 128.0; - SndOutLatencyMS = (int)pow(res, 3.0); - Clampify(SndOutLatencyMS, LATENCY_MIN, LATENCY_MAX); - FinalVolume = (float)(SendDialogMsg(hWnd, IDC_VOLUME_SLIDER, TBM_GETPOS, 0, 0)) / 100; - Interpolation = (int)SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_GETCURSEL, 0, 0); - OutputModule = (int)SendDialogMsg(hWnd, IDC_OUTPUT, CB_GETCURSEL, 0, 0); - SynchMode = (int)SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_GETCURSEL, 0, 0); - numSpeakers = (int)SendDialogMsg(hWnd, IDC_SPEAKERS, CB_GETCURSEL, 0, 0); - - WriteSettings(); - EndDialog(hWnd, 0); - } - break; - - case IDCANCEL: - EndDialog(hWnd, 0); - break; - - case IDC_OUTPUT: - if (wmEvent == CBN_SELCHANGE) - { - CheckOutputModule(hWnd); - } - break; - - case IDC_OUTCONF: - { - const int module = (int)SendMessage(GetDlgItem(hWnd, IDC_OUTPUT), CB_GETCURSEL, 0, 0); - if (mods[module] != CubebOut) - break; - - if (DialogBoxParam(nullptr, MAKEINTRESOURCE(IDD_CUBEB), hWnd, (DLGPROC)CubebConfigProc, 1) == -1) - MessageBox(hWnd, L"Error Opening the config dialog.", L"Error", MB_OK | MB_SETFOREGROUND); - } - break; - - case IDC_OPEN_CONFIG_DEBUG: - { - // Quick Hack -- DebugEnabled is re-loaded with the DebugConfig's API, - // so we need to override it here: - - bool dbgtmp = DebugEnabled; - DebugConfig::OpenDialog(); - DebugEnabled = dbgtmp; - } - break; - - case IDC_SYNCHMODE: - { - if (wmEvent == CBN_SELCHANGE) - { - int sMode = (int)SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_GETCURSEL, 0, 0); - float minlat = (sMode == 0) ? LATENCY_MIN_TS : LATENCY_MIN; - int minexp = (int)(pow(minlat + 1, 1.0 / 3.0) * 128.0); - int maxexp = (int)(pow((float)LATENCY_MAX + 1, 1.0 / 3.0) * 128.0); - INIT_SLIDER(IDC_LATENCY_SLIDER, minexp, maxexp, 54, 10, 11); - - int curpos = (int)SendMessage(GetDlgItem(hWnd, IDC_LATENCY_SLIDER), TBM_GETPOS, 0, 0); - float res = pow(curpos / 128.0, 3.0); - curpos = (int)res; - swprintf_s(temp, L"%d ms (avg)", curpos); - SetDlgItemText(hWnd, IDC_LATENCY_LABEL, temp); - bool soundtouch = sMode == 0; - EnableWindow(GetDlgItem(hWnd, IDC_OPEN_CONFIG_SOUNDTOUCH), soundtouch); - } - } - break; - - - case IDC_OPEN_CONFIG_SOUNDTOUCH: - SoundtouchCfg::OpenDialog(hWnd); - break; - - HANDLE_CHECK(IDC_DSP_ENABLE, dspPluginEnabled); - HANDLE_CHECKNB(IDC_DEBUG_ENABLE, DebugEnabled); - DebugConfig::EnableControls(hWnd); - EnableWindow(GetDlgItem(hWnd, IDC_OPEN_CONFIG_DEBUG), DebugEnabled); - break; - - default: - return FALSE; - } - break; - - case WM_HSCROLL: - { - wmEvent = LOWORD(wParam); - HWND hwndDlg = (HWND)lParam; - - int curpos = HIWORD(wParam); - - switch (wmEvent) - { - case TB_LINEUP: - case TB_LINEDOWN: - case TB_PAGEUP: - case TB_PAGEDOWN: - case TB_TOP: - case TB_BOTTOM: - curpos = (int)SendMessage(hwndDlg, TBM_GETPOS, 0, 0); - - case TB_THUMBPOSITION: - case TB_THUMBTRACK: - Clampify(curpos, - (int)SendMessage(hwndDlg, TBM_GETRANGEMIN, 0, 0), - (int)SendMessage(hwndDlg, TBM_GETRANGEMAX, 0, 0)); - - SendMessage((HWND)lParam, TBM_SETPOS, TRUE, curpos); - - if (hwndDlg == GetDlgItem(hWnd, IDC_LATENCY_SLIDER)) - { - float res = pow(curpos / 128.0, 3.0); - curpos = (int)res; - swprintf_s(temp, L"%d ms (avg)", curpos); - SetDlgItemText(hWnd, IDC_LATENCY_LABEL, temp); - } - - if (hwndDlg == GetDlgItem(hWnd, IDC_VOLUME_SLIDER)) - { - swprintf_s(temp, L"%d%%", curpos); - SetDlgItemText(hWnd, IDC_VOLUME_LABEL, temp); - } - break; - - default: - return FALSE; - } - } - break; - - default: - return FALSE; - } - return TRUE; -} - -void configure() -{ - INT_PTR ret; - ReadSettings(); - ret = DialogBoxParam(nullptr, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(), (DLGPROC)ConfigProc, 1); - if (ret == -1) - { - MessageBox(GetActiveWindow(), L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); - return; - } - ReadSettings(); -} diff --git a/pcsx2/SPU2/Windows/ConfigDebug.cpp b/pcsx2/SPU2/Windows/ConfigDebug.cpp deleted file mode 100644 index 614f988356..0000000000 --- a/pcsx2/SPU2/Windows/ConfigDebug.cpp +++ /dev/null @@ -1,292 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" -#include "pcsx2/Config.h" -#include "common/FileSystem.h" -#include "common/StringUtil.h" -#include "common/Path.h" -#include "gui/StringHelpers.h" -#include "gui/wxDirName.h" - - -bool DebugEnabled = false; -bool _MsgToConsole = false; -bool _MsgKeyOnOff = false; -bool _MsgVoiceOff = false; -bool _MsgDMA = false; -bool _MsgAutoDMA = false; -bool _MsgOverruns = false; -bool _MsgCache = false; - -bool _AccessLog = false; -bool _DMALog = false; -bool _WaveLog = false; - -bool _CoresDump = false; -bool _MemDump = false; -bool _RegDump = false; - -bool _visual_debug_enabled = false; - -// this is set true if PCSX2 invokes the SetLogDir callback, which tells SPU2 to use that over -// the configured crap in the ini file. -static bool LogLocationSetByPcsx2 = false; - -static wxString CfgLogsFolder; -static wxString CfgDumpsFolder; - -static wxDirName LogsFolder; -static wxDirName DumpsFolder; - -std::string AccessLogFileName; -std::string DMA4LogFileName; -std::string DMA7LogFileName; - -std::string CoresDumpFileName; -std::string MemDumpFileName; -std::string RegDumpFileName; - -void CfgSetLogDir(const char* dir) -{ - LogsFolder = (dir == nullptr) ? wxString(L"logs") : wxString(dir, wxConvFile); - DumpsFolder = (dir == nullptr) ? wxString(L"logs") : wxString(dir, wxConvFile); - LogLocationSetByPcsx2 = (dir != nullptr); -} - -FILE* OpenBinaryLog(const char* logfile) -{ - return FileSystem::OpenCFile(Path::Combine(EmuFolders::Logs, logfile).c_str(), "wb"); -} - -FILE* OpenLog(const char* logfile) -{ - return FileSystem::OpenCFile(Path::Combine(EmuFolders::Logs, logfile).c_str(), "w"); -} - -FILE* OpenDump(const char* logfile) -{ - return FileSystem::OpenCFile(Path::Combine(EmuFolders::Logs, logfile).c_str(), "w"); -} - -namespace DebugConfig -{ - - static const wxChar* Section = L"DEBUG"; - - void ReadSettings() - { - DebugEnabled = CfgReadBool(Section, L"Global_Enable", 0); - _MsgToConsole = CfgReadBool(Section, L"Show_Messages", 0); - _MsgKeyOnOff = CfgReadBool(Section, L"Show_Messages_Key_On_Off", 0); - _MsgVoiceOff = CfgReadBool(Section, L"Show_Messages_Voice_Off", 0); - _MsgDMA = CfgReadBool(Section, L"Show_Messages_DMA_Transfer", 0); - _MsgAutoDMA = CfgReadBool(Section, L"Show_Messages_AutoDMA", 0); - _MsgOverruns = CfgReadBool(Section, L"Show_Messages_Overruns", 0); - _MsgCache = CfgReadBool(Section, L"Show_Messages_CacheStats", 0); - - _AccessLog = CfgReadBool(Section, L"Log_Register_Access", 0); - _DMALog = CfgReadBool(Section, L"Log_DMA_Transfers", 0); - _WaveLog = CfgReadBool(Section, L"Log_WAVE_Output", 0); - - _CoresDump = CfgReadBool(Section, L"Dump_Info", 0); - _MemDump = CfgReadBool(Section, L"Dump_Memory", 0); - _RegDump = CfgReadBool(Section, L"Dump_Regs", 0); - - _visual_debug_enabled = CfgReadBool(Section, L"Visual_Debug_Enabled", 0); - - CfgReadStr(Section, L"Logs_Folder", CfgLogsFolder, L"logs"); - CfgReadStr(Section, L"Dumps_Folder", CfgDumpsFolder, L"logs"); - - wxString wxAccessLogFileName; - wxString wxDMA4LogFileName; - wxString wxDMA7LogFileName; - wxString wxCoresDumpFileName; - wxString wxMemDumpFileName; - wxString wxRegDumpFileName; - CfgReadStr(Section, L"Access_Log_Filename", wxAccessLogFileName, L"SPU2Log.txt"); - CfgReadStr(Section, L"DMA4Log_Filename", wxDMA4LogFileName, L"SPU2dma4.dat"); - CfgReadStr(Section, L"DMA7Log_Filename", wxDMA7LogFileName, L"SPU2dma7.dat"); - - CfgReadStr(Section, L"Info_Dump_Filename", wxCoresDumpFileName, L"SPU2Cores.txt"); - CfgReadStr(Section, L"Mem_Dump_Filename", wxMemDumpFileName, L"SPU2mem.dat"); - CfgReadStr(Section, L"Reg_Dump_Filename", wxRegDumpFileName, L"SPU2regs.dat"); - - AccessLogFileName = StringUtil::wxStringToUTF8String(wxAccessLogFileName); - DMA4LogFileName = StringUtil::wxStringToUTF8String(wxDMA4LogFileName); - DMA7LogFileName = StringUtil::wxStringToUTF8String(wxDMA7LogFileName); - CoresDumpFileName = StringUtil::wxStringToUTF8String(wxCoresDumpFileName); - MemDumpFileName = StringUtil::wxStringToUTF8String(wxMemDumpFileName); - RegDumpFileName = StringUtil::wxStringToUTF8String(wxRegDumpFileName); - - if (!LogLocationSetByPcsx2) - { - LogsFolder = CfgLogsFolder; - DumpsFolder = CfgLogsFolder; - } - } - - - void WriteSettings() - { - CfgWriteBool(Section, L"Global_Enable", DebugEnabled); - - CfgWriteBool(Section, L"Show_Messages", _MsgToConsole); - CfgWriteBool(Section, L"Show_Messages_Key_On_Off", _MsgKeyOnOff); - CfgWriteBool(Section, L"Show_Messages_Voice_Off", _MsgVoiceOff); - CfgWriteBool(Section, L"Show_Messages_DMA_Transfer", _MsgDMA); - CfgWriteBool(Section, L"Show_Messages_AutoDMA", _MsgAutoDMA); - CfgWriteBool(Section, L"Show_Messages_Overruns", _MsgOverruns); - CfgWriteBool(Section, L"Show_Messages_CacheStats", _MsgCache); - - CfgWriteBool(Section, L"Log_Register_Access", _AccessLog); - CfgWriteBool(Section, L"Log_DMA_Transfers", _DMALog); - CfgWriteBool(Section, L"Log_WAVE_Output", _WaveLog); - - CfgWriteBool(Section, L"Dump_Info", _CoresDump); - CfgWriteBool(Section, L"Dump_Memory", _MemDump); - CfgWriteBool(Section, L"Dump_Regs", _RegDump); - - CfgWriteBool(Section, L"Visual_Debug_Enabled", _visual_debug_enabled); - - // None of the logs strings are changable via GUI, so no point in bothering to - // write them back out. - CfgWriteStr(Section, L"Logs_Folder", CfgLogsFolder); - CfgWriteStr(Section, L"Dumps_Folder", CfgDumpsFolder); - - CfgWriteStr(Section, L"Access_Log_Filename", StringUtil::UTF8StringToWxString(AccessLogFileName)); - CfgWriteStr(Section, L"DMA4Log_Filename", StringUtil::UTF8StringToWxString(DMA4LogFileName)); - CfgWriteStr(Section, L"DMA7Log_Filename", StringUtil::UTF8StringToWxString(DMA7LogFileName)); - - CfgWriteStr(Section, L"Info_Dump_Filename", StringUtil::UTF8StringToWxString(CoresDumpFileName)); - CfgWriteStr(Section, L"Mem_Dump_Filename", StringUtil::UTF8StringToWxString(MemDumpFileName)); - CfgWriteStr(Section, L"Reg_Dump_Filename", StringUtil::UTF8StringToWxString(RegDumpFileName)); - } - - static void EnableMessages(HWND hWnd) - { - ENABLE_CONTROL(IDC_MSGSHOW, DebugEnabled); - ENABLE_CONTROL(IDC_MSGKEY, MsgToConsole()); - ENABLE_CONTROL(IDC_MSGVOICE, MsgToConsole()); - ENABLE_CONTROL(IDC_MSGDMA, MsgToConsole()); - ENABLE_CONTROL(IDC_MSGADMA, MsgToConsole()); - ENABLE_CONTROL(IDC_DBG_OVERRUNS, MsgToConsole()); - ENABLE_CONTROL(IDC_DBG_CACHE, MsgToConsole()); - } - - void EnableControls(HWND hWnd) - { - EnableMessages(hWnd); - ENABLE_CONTROL(IDC_LOGDMA, DebugEnabled); - ENABLE_CONTROL(IDC_LOGREGS, IsDevBuild ? DebugEnabled : false); - ENABLE_CONTROL(IDC_LOGWAVE, IsDevBuild ? DebugEnabled : false); - ENABLE_CONTROL(IDC_DUMPCORE, DebugEnabled); - ENABLE_CONTROL(IDC_DUMPMEM, DebugEnabled); - ENABLE_CONTROL(IDC_DUMPREGS, DebugEnabled); - ENABLE_CONTROL(IDC_DEBUG_VISUAL, IsDevBuild ? DebugEnabled : false); - } - - static BOOL CALLBACK DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) - { - int wmId; - //wchar_t temp[384]={0}; - - switch (uMsg) - { - case WM_PAINT: - return FALSE; - - case WM_INITDIALOG: - { - EnableControls(hWnd); - - // Debugging / Logging Flags: - SET_CHECK(IDC_DEBUG, DebugEnabled); - SET_CHECK(IDC_MSGSHOW, _MsgToConsole); - SET_CHECK(IDC_MSGKEY, _MsgKeyOnOff); - SET_CHECK(IDC_MSGVOICE, _MsgVoiceOff); - SET_CHECK(IDC_MSGDMA, _MsgDMA); - SET_CHECK(IDC_MSGADMA, _MsgAutoDMA); - SET_CHECK(IDC_DBG_OVERRUNS, _MsgOverruns); - SET_CHECK(IDC_DBG_CACHE, _MsgCache); - SET_CHECK(IDC_LOGREGS, _AccessLog); - SET_CHECK(IDC_LOGDMA, _DMALog); - SET_CHECK(IDC_LOGWAVE, _WaveLog); - SET_CHECK(IDC_DUMPCORE, _CoresDump); - SET_CHECK(IDC_DUMPMEM, _MemDump); - SET_CHECK(IDC_DUMPREGS, _RegDump); - SET_CHECK(IDC_DEBUG_VISUAL, _visual_debug_enabled); - - ShowWindow(GetDlgItem(hWnd, IDC_MSG_PUBLIC_BUILD), !IsDevBuild); - } - break; - - case WM_COMMAND: - wmId = LOWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - WriteSettings(); - EndDialog(hWnd, 0); - break; - - case IDCANCEL: - EndDialog(hWnd, 0); - break; - - HANDLE_CHECKNB(IDC_MSGSHOW, _MsgToConsole); - EnableMessages(hWnd); - break; - - HANDLE_CHECK(IDC_MSGKEY, _MsgKeyOnOff); - HANDLE_CHECK(IDC_MSGVOICE, _MsgVoiceOff); - HANDLE_CHECK(IDC_MSGDMA, _MsgDMA); - HANDLE_CHECK(IDC_MSGADMA, _MsgAutoDMA); - break; - - HANDLE_CHECK(IDC_DBG_OVERRUNS, _MsgOverruns); - HANDLE_CHECK(IDC_DBG_CACHE, _MsgCache); - HANDLE_CHECK(IDC_LOGREGS, _AccessLog); - HANDLE_CHECK(IDC_LOGDMA, _DMALog); - HANDLE_CHECK(IDC_LOGWAVE, _WaveLog); - HANDLE_CHECK(IDC_DUMPCORE, _CoresDump); - HANDLE_CHECK(IDC_DUMPMEM, _MemDump); - HANDLE_CHECK(IDC_DUMPREGS, _RegDump); - HANDLE_CHECK(IDC_DEBUG_VISUAL, _visual_debug_enabled); - default: - return FALSE; - } - break; - - default: - return FALSE; - } - return TRUE; - } - - void OpenDialog() - { - INT_PTR ret = DialogBoxParam(nullptr, MAKEINTRESOURCE(IDD_CONFIG_DEBUG), GetActiveWindow(), (DLGPROC)DialogProc, 1); - if (ret == -1) - { - MessageBox(GetActiveWindow(), L"Error Opening the debug configuration dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); - return; - } - ReadSettings(); - } -} // namespace DebugConfig diff --git a/pcsx2/SPU2/Windows/ConfigSoundTouch.cpp b/pcsx2/SPU2/Windows/ConfigSoundTouch.cpp deleted file mode 100644 index 0a8df6e0f2..0000000000 --- a/pcsx2/SPU2/Windows/ConfigSoundTouch.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" - -#include "SoundTouch.h" - -static int SequenceLenMS = 30; -static int SeekWindowMS = 20; -static int OverlapMS = 10; - -// Timestretch Slider Bounds, Min/Max -static const int SequenceLen_Min = 20; -static const int SequenceLen_Max = 100; - -static const int SeekWindow_Min = 10; -static const int SeekWindow_Max = 30; - -static const int Overlap_Min = 5; -static const int Overlap_Max = 15; - -void SoundtouchCfg::ApplySettings(soundtouch::SoundTouch& sndtouch) -{ - sndtouch.setSetting(SETTING_SEQUENCE_MS, SequenceLenMS); - sndtouch.setSetting(SETTING_SEEKWINDOW_MS, SeekWindowMS); - sndtouch.setSetting(SETTING_OVERLAP_MS, OverlapMS); -} - -static void ClampValues() -{ - Clampify(SequenceLenMS, SequenceLen_Min, SequenceLen_Max); - Clampify(SeekWindowMS, SeekWindow_Min, SeekWindow_Max); - Clampify(OverlapMS, Overlap_Min, Overlap_Max); -} - -void SoundtouchCfg::ReadSettings() -{ - SequenceLenMS = CfgReadInt(L"SOUNDTOUCH", L"SequenceLengthMS", 30); - SeekWindowMS = CfgReadInt(L"SOUNDTOUCH", L"SeekWindowMS", 20); - OverlapMS = CfgReadInt(L"SOUNDTOUCH", L"OverlapMS", 10); - - ClampValues(); -} - -void SoundtouchCfg::WriteSettings() -{ - CfgWriteInt(L"SOUNDTOUCH", L"SequenceLengthMS", SequenceLenMS); - CfgWriteInt(L"SOUNDTOUCH", L"SeekWindowMS", SeekWindowMS); - CfgWriteInt(L"SOUNDTOUCH", L"OverlapMS", OverlapMS); -} - -BOOL CALLBACK SoundtouchCfg::DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - int wmId; - //wchar_t temp[384]={0}; - - switch (uMsg) - { - case WM_PAINT: - return FALSE; - - case WM_INITDIALOG: - { - INIT_SLIDER(IDC_SEQLEN_SLIDER, SequenceLen_Min, SequenceLen_Max, 20, 5, 1); - INIT_SLIDER(IDC_SEEKWIN_SLIDER, SeekWindow_Min, SeekWindow_Max, 5, 2, 1); - INIT_SLIDER(IDC_OVERLAP_SLIDER, Overlap_Min, Overlap_Max, 3, 2, 1); - - SendDialogMsg(hWnd, IDC_SEQLEN_SLIDER, TBM_SETPOS, TRUE, SequenceLenMS); - SendDialogMsg(hWnd, IDC_SEEKWIN_SLIDER, TBM_SETPOS, TRUE, SeekWindowMS); - SendDialogMsg(hWnd, IDC_OVERLAP_SLIDER, TBM_SETPOS, TRUE, OverlapMS); - } - - case WM_COMMAND: - wmId = LOWORD(wParam); - // Parse the menu selections: - if (wmId == IDOK) - { - SequenceLenMS = (int)SendDialogMsg(hWnd, IDC_SEQLEN_SLIDER, TBM_GETPOS, 0, 0); - SeekWindowMS = (int)SendDialogMsg(hWnd, IDC_SEEKWIN_SLIDER, TBM_GETPOS, 0, 0); - OverlapMS = (int)SendDialogMsg(hWnd, IDC_OVERLAP_SLIDER, TBM_GETPOS, 0, 0); - - ClampValues(); - WriteSettings(); - EndDialog(hWnd, 0); - } - else if (wmId == IDC_RESET_DEFAULTS) - { - SequenceLenMS = 30; - SeekWindowMS = 20; - OverlapMS = 10; - - SendDialogMsg(hWnd, IDC_SEQLEN_SLIDER, TBM_SETPOS, TRUE, SequenceLenMS); - SendDialogMsg(hWnd, IDC_SEEKWIN_SLIDER, TBM_SETPOS, TRUE, SeekWindowMS); - SendDialogMsg(hWnd, IDC_OVERLAP_SLIDER, TBM_SETPOS, TRUE, OverlapMS); - - AssignSliderValue((HWND)lParam, hWnd, SequenceLenMS); - } - else if (wmId == IDCANCEL) - { - EndDialog(hWnd, 0); - } - break; - - case WM_HSCROLL: - DoHandleScrollMessage(hWnd, wParam, lParam); - break; - - default: - return FALSE; - } - return TRUE; -} - -void SoundtouchCfg::OpenDialog(HWND hWnd) -{ - INT_PTR ret; - ret = DialogBox(nullptr, MAKEINTRESOURCE(IDD_CONFIG_SOUNDTOUCH), hWnd, (DLGPROC)DialogProc); - if (ret == -1) - { - MessageBox(GetActiveWindow(), L"Error Opening the Soundtouch advanced dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); - return; - } - ReadSettings(); -} diff --git a/pcsx2/SPU2/Windows/Dialogs.h b/pcsx2/SPU2/Windows/Dialogs.h deleted file mode 100644 index 7747834655..0000000000 --- a/pcsx2/SPU2/Windows/Dialogs.h +++ /dev/null @@ -1,61 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#ifdef _WIN32 -#include "WinConfig.h" -#else -#include "LnxConfig.h" -#endif - -namespace DebugConfig -{ - extern void ReadSettings(); - extern void WriteSettings(); - extern void OpenDialog(); - extern void EnableControls(HWND hWnd); -} // namespace DebugConfig - -namespace SoundtouchCfg -{ - extern void ReadSettings(); - extern void WriteSettings(); - extern void OpenDialog(HWND hWnd); - extern BOOL CALLBACK DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -} // namespace SoundtouchCfg - -extern int SendDialogMsg(HWND hwnd, int dlgId, UINT code, WPARAM wParam, LPARAM lParam); - -extern void AssignSliderValue(HWND idcwnd, HWND hwndDisplay, int value); -extern void AssignSliderValue(HWND hWnd, int idc, int editbox, int value); -extern int GetSliderValue(HWND hWnd, int idc); -extern BOOL DoHandleScrollMessage(HWND hwndDisplay, WPARAM wParam, LPARAM lParam); - -extern void CfgSetSettingsDir(const char* dir); -extern void CfgSetLogDir(const char* dir); - -extern bool CfgFindName(const TCHAR* Section, const TCHAR* Name); - -extern void CfgWriteBool(const TCHAR* Section, const TCHAR* Name, bool Value); -extern void CfgWriteInt(const TCHAR* Section, const TCHAR* Name, int Value); -extern void CfgWriteFloat(const TCHAR* Section, const TCHAR* Name, float Value); -extern void CfgWriteStr(const TCHAR* Section, const TCHAR* Name, const wxString& Data); - -extern bool CfgReadBool(const TCHAR* Section, const TCHAR* Name, bool Default); -extern void CfgReadStr(const TCHAR* Section, const TCHAR* Name, wxString& Data, const TCHAR* Default); -extern void CfgReadStr(const TCHAR* Section, const TCHAR* Name, TCHAR* Data, int DataSize, const TCHAR* Default); -extern int CfgReadInt(const TCHAR* Section, const TCHAR* Name, int Default); -extern float CfgReadFloat(const TCHAR* Section, const TCHAR* Name, float Default); diff --git a/pcsx2/SPU2/Windows/RealtimeDebugger.cpp b/pcsx2/SPU2/Windows/RealtimeDebugger.cpp deleted file mode 100644 index 7b25e04867..0000000000 --- a/pcsx2/SPU2/Windows/RealtimeDebugger.cpp +++ /dev/null @@ -1,287 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" - -bool debugDialogOpen = false; -HWND hDebugDialog = nullptr; - -#ifdef PCSX2_DEVBUILD - -int FillRectangle(HDC dc, int left, int top, int width, int height) -{ - RECT r = {left, top, left + width, top + height}; - - return FillRect(dc, &r, (HBRUSH)GetStockObject(DC_BRUSH)); -} - -BOOL DrawRectangle(HDC dc, int left, int top, int width, int height) -{ - RECT r = {left, top, left + width, top + height}; - - POINT p[5] = { - {r.left, r.top}, - {r.right, r.top}, - {r.right, r.bottom}, - {r.left, r.bottom}, - {r.left, r.top}, - }; - - return Polyline(dc, p, 5); -} - - -HFONT hf = nullptr; -int lCount = 0; -void UpdateDebugDialog() -{ - if (!debugDialogOpen) - return; - - lCount++; - if (lCount >= (SampleRate / 100)) // Increase to SampleRate/200 for smooth display. - { - HDC hdc = GetDC(hDebugDialog); - - if (!hf) - { - hf = CreateFont(12, 0, 0, 0, 0, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, L"Lucida Console"); - } - - SelectObject(hdc, hf); - SelectObject(hdc, GetStockObject(DC_BRUSH)); - SelectObject(hdc, GetStockObject(DC_PEN)); - - for (int c = 0; c < 2; c++) - { - V_Core& cx(Cores[c]); - V_CoreDebug& cd(DebugCores[c]); - - for (int v = 0; v < 24; v++) - { - int cc = c * 2 + (v / 12); - int vv = v % 12; - int IX = 8 + 128 * cc; - int IY = 8 + 48 * vv; - V_Voice& vc(cx.Voices[v]); - V_VoiceDebug& vcd(cd.Voices[v]); - - SetDCBrushColor(hdc, RGB(0, 0, 0)); - if ((vc.ADSR.Phase > 0) && (vc.ADSR.Phase < 6)) - { - SetDCBrushColor(hdc, RGB(0, 0, 128)); // light blue for playing voice - if (vc.Modulated) - { - SetDCBrushColor(hdc, RGB(0, 128, 0)); // light green for playing voice with modulation enabled - } - if (vc.Noise) - { - SetDCBrushColor(hdc, RGB(128, 0, 0)); // light red for playing voice with noise enabled - } - } - /* - else - { - if(vcd.lastStopReason==1) - { - SetDCBrushColor(hdc,RGB(128, 0, 0)); - } - if(vcd.lastStopReason==2) - { - SetDCBrushColor(hdc,RGB( 0,128, 0)); - } - }*/ - - FillRectangle(hdc, IX, IY, 124, 46); - - SetDCPenColor(hdc, RGB(255, 128, 32)); - - DrawRectangle(hdc, IX, IY, 124, 46); - - SetDCBrushColor(hdc, RGB(0, 255, 0)); - - int vl = abs(((vc.Volume.Left.Value >> 16) * 38) >> 15); - int vr = abs(((vc.Volume.Right.Value >> 16) * 38) >> 15); - - FillRectangle(hdc, IX + 58, IY + 42 - vl, 4, vl); - FillRectangle(hdc, IX + 62, IY + 42 - vr, 4, vr); - - int adsr = ((vc.ADSR.Value >> 16) * 38) / 32768; - - FillRectangle(hdc, IX + 66, IY + 42 - adsr, 4, adsr); - - int peak = (vcd.displayPeak * 38) / 32768; - - if (vcd.displayPeak >= 32700) // leave a little bit of margin - { - SetDCBrushColor(hdc, RGB(255, 0, 0)); - } - - FillRectangle(hdc, IX + 70, IY + 42 - peak, 4, peak); - - if (vc.ADSR.Value > 0) - { - if (vc.SBuffer) - for (int i = 0; i < 28; i++) - { - int val = ((int)vc.SBuffer[i] * 20) / 32768; - - int y = 0; - - if (val > 0) - { - y = val; - } - else - val = -val; - - if (val != 0) - { - FillRectangle(hdc, IX + 90 + i, IY + 24 - y, 1, val); - } - } - } - - SetTextColor(hdc, RGB(0, 255, 0)); - SetBkColor(hdc, RGB(0, 0, 0)); - - static wchar_t t[256]; - - swprintf_s(t, L"%06x", vc.StartA); - TextOut(hdc, IX + 4, IY + 4, t, 6); - - swprintf_s(t, L"%06x", vc.NextA); - TextOut(hdc, IX + 4, IY + 18, t, 6); - - swprintf_s(t, L"%06x", vc.LoopStartA); - TextOut(hdc, IX + 4, IY + 32, t, 6); - - vcd.displayPeak = 0; - } - - // top now: 400 - int JX = 8 + c * 256; - int JY = 584; - - SetDCBrushColor(hdc, RGB(0, 0, 0)); - SetDCPenColor(hdc, RGB(255, 128, 32)); - - FillRectangle(hdc, JX, JY, 252, 60); - DrawRectangle(hdc, JX, JY, 252, 60); - - SetTextColor(hdc, RGB(255, 255, 255)); - SetBkColor(hdc, RGB(0, 0, 0)); - - static wchar_t t[256]; - TextOut(hdc, JX + 4, JY + 4, L"REVB", 4); - TextOut(hdc, JX + 4, JY + 18, L"IRQE", 4); - TextOut(hdc, JX + 4, JY + 32, L"ADMA", 4); - swprintf_s(t, L"DMA%s", c == 0 ? L"4" : L"7"); - TextOut(hdc, JX + 4, JY + 46, t, 4); - - SetTextColor(hdc, RGB(0, 255, 0)); - memset(t, 0, sizeof(t)); - swprintf_s(t, L"ESA %x", cx.EffectsStartA); - TextOut(hdc, JX + 56, JY + 4, t, 9); - memset(t, 0, sizeof(t)); - swprintf_s(t, L"EEA %x", cx.EffectsEndA); - TextOut(hdc, JX + 128, JY + 4, t, 9); - memset(t, 0, sizeof(t)); - swprintf_s(t, L"(%x)", cx.EffectsBufferSize); - TextOut(hdc, JX + 200, JY + 4, t, 7); - - memset(t, 0, sizeof(t)); - swprintf_s(t, L"IRQA %x", cx.IRQA); - TextOut(hdc, JX + 56, JY + 18, t, 12); - - SetTextColor(hdc, RGB(255, 255, 255)); - SetDCBrushColor(hdc, RGB(255, 0, 0)); - - if (cx.FxEnable) - { - FillRectangle(hdc, JX + 40, JY + 4, 10, 10); - } - if (cx.IRQEnable) - { - FillRectangle(hdc, JX + 40, JY + 18, 10, 10); - } - if (cx.AutoDMACtrl != 0) - { - FillRectangle(hdc, JX + 40, JY + 32, 10, 10); - - for (int j = 0; j < 64; j++) - { - int i = j * 256 / 64; - int val = (cd.admaWaveformL[i] * 26) / 32768; - int y = 0; - - if (val > 0) - y = val; - else - val = -val; - - if (val != 0) - { - FillRectangle(hdc, JX + 60 + j, JY + 30 - y, 1, val); - } - } - - for (int j = 0; j < 64; j++) - { - int i = j * 256 / 64; - int val = (cd.admaWaveformR[i] * 26) / 32768; - int y = 0; - - if (val > 0) - y = val; - else - val = -val; - - if (val != 0) - { - FillRectangle(hdc, JX + 136 + j, JY + 30 - y, 1, val); - } - } - } - if (cd.dmaFlag > 0) // So it shows x times this is called, since dmas are so fast - { - swprintf_s(t, L"size = %d", cd.lastsize); - - TextOut(hdc, JX + 64, JY + 46, t, wcslen(t)); - FillRectangle(hdc, JX + 40, JY + 46, 10, 10); - cd.dmaFlag--; - } - } - - ReleaseDC(hDebugDialog, hdc); - lCount = 0; - } - - MSG msg; - while (PeekMessage(&msg, hDebugDialog, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } -} -#else -void UpdateDebugDialog() -{ - // Release mode. Nothing to do -} -#endif diff --git a/pcsx2/SPU2/Windows/SPU2.rc b/pcsx2/SPU2/Windows/SPU2.rc deleted file mode 100644 index 829c66854a..0000000000 --- a/pcsx2/SPU2/Windows/SPU2.rc +++ /dev/null @@ -1,252 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "common/afxresmw.h" -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_CONFIG DIALOGEX 0, 0, 325, 195 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Audio Settings" -FONT 8, "MS Shell Dlg", 400, 0, 0x0 -BEGIN - PUSHBUTTON "OK",IDOK,113,174,50,14,NOT WS_TABSTOP - PUSHBUTTON "Cancel",IDCANCEL,173,174,50,14,NOT WS_TABSTOP - GROUPBOX "Mixing Settings",IDC_STATIC,6,5,157,115 - LTEXT "Interpolation:",IDC_STATIC,12,16,61,10,NOT WS_GROUP - COMBOBOX IDC_INTERPOLATE,12,26,142,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "",IDC_STATIC,6,124,157,45 - CHECKBOX "Enable Debug Options",IDC_DEBUG_ENABLE,11,135,118,10,NOT WS_TABSTOP - PUSHBUTTON "Configure...",IDC_OPEN_CONFIG_DEBUG,11,147,52,13 - GROUPBOX "Output Settings",IDC_STATIC,173,5,145,164 - LTEXT "Module:",IDC_STATIC,179,16,50,9,NOT WS_GROUP - COMBOBOX IDC_OUTPUT,179,26,130,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Configure...",IDC_OUTCONF,179,42,52,13 - LTEXT "Volume:",IDC_STATIC,204,61,27,8,NOT WS_GROUP - CTEXT "100%",IDC_VOLUME_LABEL,242,61,58,9 - CONTROL "",IDC_VOLUME_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,181,72,129,10 - LTEXT "Latency:",IDC_STATIC,204,86,29,8,NOT WS_GROUP - CTEXT "100 ms (avg)",IDC_LATENCY_LABEL,241,86,58,9 - CONTROL "Slider2",IDC_LATENCY_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,181,96,129,10 - CONTROL "Synchronizing Mode:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,42,133,8 - COMBOBOX IDC_SYNCHMODE,12,54,142,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced...",IDC_OPEN_CONFIG_SOUNDTOUCH,12,72,52,13 - LTEXT "Audio Expansion Mode:",IDC_SPEAKERS_TEXT,12,90,137,10,NOT WS_GROUP - COMBOBOX IDC_SPEAKERS,12,102,142,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Use a Winamp DSP plugin",IDC_DSP_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,110,129,11 - LTEXT "(currently requires manual configuration via the ini file)",IDC_STATIC,193,122,100,20 -END - -IDD_DEBUG DIALOGEX 0, 0, 303, 473 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SPU2 Debug" -FONT 9, "Lucida Console", 400, 0, 0x0 -BEGIN - DEFPUSHBUTTON "Close",IDOK,246,451,50,14 -END - -IDD_CONFIG_SOUNDTOUCH DIALOGEX 0, 0, 206, 223 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Soundtouch Advanced Configuration - SPU2" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,50,201,50,14 - PUSHBUTTON "Cancel",IDCANCEL,106,201,50,14 - CTEXT "These are advanced configuration options for fine tuning time stretching behavior. Larger values are better for slowdown, while smaller values are better for speed-up (better than 60fps).\n\nAll options are in milliseconds (ms).",IDC_STATIC,5,5,196,52 - CONTROL "",IDC_SEQLEN_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,98,105,10 - CTEXT "Sequence Length",IDC_STATIC,72,86,64,9 - CONTROL "",IDC_SEEKWIN_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,134,105,10 - CTEXT "Seekwindow Size",IDC_STATIC,70,123,66,9 - CONTROL "",IDC_OVERLAP_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,168,105,10 - CTEXT "Overlap",IDC_STATIC,86,160,34,9 - LTEXT "20",IDC_STATIC,50,110,9,8 - LTEXT "100",IDC_STATIC,146,110,13,8 - LTEXT "10",IDC_STATIC,50,147,9,8 - LTEXT "30",IDC_STATIC,146,147,9,8 - LTEXT "5",IDC_STATIC,52,182,8,8 - LTEXT "15",IDC_STATIC,146,182,9,8 - PUSHBUTTON "Reset Defaults",IDC_RESET_DEFAULTS,61,62,82,12 -END - -IDD_CONFIG_DEBUG DIALOGEX 0, 0, 292, 239 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SPU2 Debugging Options" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,93,217,50,14 - PUSHBUTTON "Cancel",IDCANCEL,149,217,50,14 - GROUPBOX "",IDC_STATIC,5,5,135,93 - GROUPBOX "Logfile-only Logs",IDC_STATIC,151,5,136,53 - GROUPBOX "Dumps (on close)",IDC_STATIC,151,60,135,54 - CONTROL "Show In Console",IDC_MSGSHOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,5,69,10 - CHECKBOX "KeyOn/Off Events",IDC_MSGKEY,17,18,74,9,NOT WS_TABSTOP - CONTROL "Voice Stop Events",IDC_MSGVOICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,31,75,9 - CONTROL "DMA Operations",IDC_MSGDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,44,68,9 - CONTROL "AutoDMA Operations",IDC_MSGADMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,57,83,9 - CONTROL "Buffer Over/Underruns",IDC_DBG_OVERRUNS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,70,97,9 - CONTROL "ADPCM Cache Statistics",IDC_DBG_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,83,114,9 - CHECKBOX "Dump Core and Voice State",IDC_DUMPCORE,159,74,104,10,NOT WS_TABSTOP - CHECKBOX "Dump Memory Contents",IDC_DUMPMEM,159,87,91,10,NOT WS_TABSTOP - CHECKBOX "Dump Register Data",IDC_DUMPREGS,159,100,80,10,NOT WS_TABSTOP - CHECKBOX "Log Register/DMA Actions",IDC_LOGREGS,159,18,101,10,WS_GROUP | NOT WS_TABSTOP - CHECKBOX "Log DMA Writes",IDC_LOGDMA,159,31,68,10,NOT WS_TABSTOP - CHECKBOX "Log Audio Output",IDC_LOGWAVE,159,44,71,10,NOT WS_TABSTOP - LTEXT "Note: This is a non-devel build. For performance reasons, some logging options are disabled; and only available in devel/debug builds.",IDC_MSG_PUBLIC_BUILD,9,187,174,30 - GROUPBOX "Others",IDC_DEBUG_OTHERS,5,104,135,68 - CONTROL "Show Core Activity",IDC_DEBUG_VISUAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,116,90,11 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 324 - VERTGUIDE, 218 - VERTGUIDE, 282 - BOTTOMMARGIN, 194 - END - - IDD_DEBUG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 296 - TOPMARGIN, 7 - BOTTOMMARGIN, 465 - END - - IDD_CONFIG_SOUNDTOUCH, DIALOG - BEGIN - LEFTMARGIN, 5 - RIGHTMARGIN, 201 - TOPMARGIN, 5 - BOTTOMMARGIN, 218 - END - - IDD_CONFIG_DEBUG, DIALOG - BEGIN - LEFTMARGIN, 5 - RIGHTMARGIN, 287 - TOPMARGIN, 5 - BOTTOMMARGIN, 234 - END -END -#endif // APSTUDIO_INVOKED - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (United Kingdom) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_CUBEB DIALOGEX 0, 0, 316, 166 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Cubeb Output Module Settings" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,105,144,50,14 - PUSHBUTTON "Cancel",IDCANCEL,161,144,50,14 - COMBOBOX IDC_BACKEND,7,17,95,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Backend:",IDC_STATIC,7,7,32,8 - CONTROL "",IDC_LATENCY,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,96,93,155,10 - LTEXT "NOTE: Depending on the hardware and drivers, the suggested manual latency might not be used, and Cubeb will choose the closest possible value.",IDC_STATIC,12,111,286,19 - CTEXT "20ms",IDC_LATENCY_LABEL,264,93,35,11 - GROUPBOX "Output Latency",IDC_STATIC,7,57,302,79 - CONTROL "Use smallest possible (may cause issues if the actual value is too small)",IDC_MINIMIZE, - "Button",BS_AUTORADIOBUTTON | WS_GROUP,12,75,258,10 - CONTROL "Use this latency:",IDC_MANUAL,"Button",BS_AUTORADIOBUTTON,12,93,69,10 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_CUBEB, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 159 - END -END -#endif // APSTUDIO_INVOKED - -#endif // English (United Kingdom) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Spanish (Spain, International Sort) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN -#pragma code_page(1252) - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""svnrev.h""\r\n" - "#include ""afxresmw.h""\0" -END - -3 TEXTINCLUDE -BEGIN - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Spanish (Spain, International Sort) resources -///////////////////////////////////////////////////////////////////////////// - - diff --git a/pcsx2/SPU2/Windows/UIHelpers.cpp b/pcsx2/SPU2/Windows/UIHelpers.cpp deleted file mode 100644 index 22c1a6c8e6..0000000000 --- a/pcsx2/SPU2/Windows/UIHelpers.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" -#include "Dialogs.h" - -int SendDialogMsg(HWND hwnd, int dlgId, UINT code, WPARAM wParam, LPARAM lParam) -{ - return SendMessage(GetDlgItem(hwnd, dlgId), code, wParam, lParam); -} - -void AssignSliderValue(HWND idcwnd, HWND hwndDisplay, int value) -{ - value = std::min(std::max(value, 0), 512); - SendMessage(idcwnd, TBM_SETPOS, TRUE, value); - - wchar_t tbox[32]; - swprintf_s(tbox, L"%d", value); - SetWindowText(hwndDisplay, tbox); -} - -void AssignSliderValue(HWND hWnd, int idc, int editbox, int value) -{ - AssignSliderValue(GetDlgItem(hWnd, idc), GetDlgItem(hWnd, editbox), value); -} - -// Generic slider/scroller message handler. This is succient so long as you -// don't need some kind of secondary event handling functionality, such as -// updating a custom label. -BOOL DoHandleScrollMessage(HWND hwndDisplay, WPARAM wParam, LPARAM lParam) -{ - int wmId = LOWORD(wParam); - int wmEvent = HIWORD(wParam); - - switch (wmId) - { - //case TB_ENDTRACK: - //case TB_THUMBPOSITION: - case TB_LINEUP: - case TB_LINEDOWN: - case TB_PAGEUP: - case TB_PAGEDOWN: - wmEvent = (int)SendMessage((HWND)lParam, TBM_GETPOS, 0, 0); - case TB_THUMBTRACK: - AssignSliderValue((HWND)lParam, hwndDisplay, wmEvent); - break; - - default: - return FALSE; - } - return TRUE; -} - -int GetSliderValue(HWND hWnd, int idc) -{ - int retval = (int)SendMessage(GetDlgItem(hWnd, idc), TBM_GETPOS, 0, 0); - return GetClamped(retval, 0, 512); -} diff --git a/pcsx2/SPU2/Windows/WinConfig.h b/pcsx2/SPU2/Windows/WinConfig.h deleted file mode 100644 index bf2aab4f5f..0000000000 --- a/pcsx2/SPU2/Windows/WinConfig.h +++ /dev/null @@ -1,71 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 -#endif -#include -#include -#include -#include -#include -#include - -#include "resource.h" - -extern HINSTANCE hInstance; - -#define SET_CHECK(idc, value) SendMessage(GetDlgItem(hWnd, idc), BM_SETCHECK, ((value) == 0) ? BST_UNCHECKED : BST_CHECKED, 0) -#define HANDLE_CHECK(idc, hvar) \ - case idc: \ - (hvar) = !(hvar); \ - SendMessage(GetDlgItem(hWnd, idc), BM_SETCHECK, (hvar) ? BST_CHECKED : BST_UNCHECKED, 0); \ - break -#define HANDLE_CHECKNB(idc, hvar) \ - case idc: \ - (hvar) = !(hvar); \ - SendMessage(GetDlgItem(hWnd, idc), BM_SETCHECK, (hvar) ? BST_CHECKED : BST_UNCHECKED, 0) -#define ENABLE_CONTROL(idc, value) EnableWindow(GetDlgItem(hWnd, idc), value) - -#define INIT_SLIDER(idc, minrange, maxrange, tickfreq, pagesize, linesize) \ - SendMessage(GetDlgItem(hWnd, idc), TBM_SETRANGEMIN, FALSE, minrange); \ - SendMessage(GetDlgItem(hWnd, idc), TBM_SETRANGEMAX, FALSE, maxrange); \ - SendMessage(GetDlgItem(hWnd, idc), TBM_SETTICFREQ, tickfreq, 0); \ - SendMessage(GetDlgItem(hWnd, idc), TBM_SETPAGESIZE, 0, pagesize); \ - SendMessage(GetDlgItem(hWnd, idc), TBM_SETLINESIZE, 0, linesize) - -#define HANDLE_SCROLL_MESSAGE(idc, idcDisplay) \ - if ((HWND)lParam == GetDlgItem(hWnd, idc)) \ - return DoHandleScrollMessage(GetDlgItem(hWnd, idcDisplay), wParam, lParam) - - -// *** BEGIN DRIVER-SPECIFIC CONFIGURATION *** -// ------------------------------------------- - -struct CONFIG_XAUDIO2 -{ - wxString Device; - s8 NumBuffers; - - CONFIG_XAUDIO2() - : Device() - , NumBuffers(2) - { - } -}; - -extern CONFIG_XAUDIO2 Config_XAudio2; diff --git a/pcsx2/SPU2/Windows/dsp.cpp b/pcsx2/SPU2/Windows/dsp.cpp deleted file mode 100644 index 7eec069b3d..0000000000 --- a/pcsx2/SPU2/Windows/dsp.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Global.h" - -#include -#include - - -extern "C" { -#include "dsp.h" - -typedef winampDSPHeader* (*pWinampDSPGetHeader2)(); -} - -HMODULE hLib = nullptr; -pWinampDSPGetHeader2 pGetHeader = nullptr; -winampDSPHeader* pHeader = nullptr; - -winampDSPModule* pModule = nullptr; - -HWND hTemp; - -#define USE_A_THREAD -#ifdef USE_A_THREAD - -HANDLE hUpdateThread; -DWORD UpdateThreadId; - -bool running; - -DWORD WINAPI DspUpdateThread(PVOID param); -#endif -s32 DspLoadLibrary(wchar_t* fileName, int modNum) -#ifdef USE_A_THREAD -{ - if (!dspPluginEnabled) - return -1; - - running = true; - hUpdateThread = CreateThread(nullptr, 0, DspUpdateThread, nullptr, 0, &UpdateThreadId); - return (hUpdateThread == INVALID_HANDLE_VALUE); -} - -s32 DspLoadLibrary2(wchar_t* fileName, int modNum) -#endif -{ - if (!dspPluginEnabled) - return -1; - - hLib = LoadLibraryW(fileName); - if (!hLib) - { - return 1; - } - - pGetHeader = (pWinampDSPGetHeader2)GetProcAddress(hLib, "winampDSPGetHeader2"); - - if (!pGetHeader) - { - FreeLibrary(hLib); - hLib = nullptr; - return 1; - } - - pHeader = pGetHeader(); - - pModule = pHeader->getModule(modNum); - - if (!pModule) - { - pGetHeader = nullptr; - pHeader = nullptr; - FreeLibrary(hLib); - hLib = nullptr; - return -1; - } - - pModule->hDllInstance = hLib; - pModule->hwndParent = 0; - pModule->Init(pModule); - - return 0; -} - -void DspCloseLibrary() -#ifdef USE_A_THREAD -{ - if (!dspPluginEnabled) - return; - - PostThreadMessage(UpdateThreadId, WM_QUIT, 0, 0); - running = false; - if (WaitForSingleObject(hUpdateThread, 1000) == WAIT_TIMEOUT) - { - ConLog("SPU2: WARNING: DSP Thread did not close itself in time. Assuming hung. Terminating.\n"); - TerminateThread(hUpdateThread, 1); - } -} - -void DspCloseLibrary2() -#endif -{ - if (!dspPluginEnabled) - return; - - if (hLib) - { - pModule->Quit(pModule); - FreeLibrary(hLib); - } - pModule = nullptr; - pHeader = nullptr; - pGetHeader = nullptr; - hLib = nullptr; -} - -int DspProcess(s16* buffer, int samples) -{ - if (!dspPluginEnabled) - return samples; - - if (hLib) - { - return pModule->ModifySamples(pModule, buffer, samples, 16, 2, SampleRate); - } - return samples; -} - -void DspUpdate() -#ifdef USE_A_THREAD -{ -} - -DWORD WINAPI DspUpdateThread(PVOID param) -{ - if (!dspPluginEnabled) - return -1; - - if (DspLoadLibrary2(dspPlugin, dspPluginModule)) - return -1; - - MSG msg; - while (running) - { - GetMessage(&msg, 0, 0, 0); - if ((msg.hwnd == nullptr) && (msg.message == WM_QUIT)) - { - break; - } - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - DspCloseLibrary2(); - return 0; -} - -#else -{ - if (!dspPluginEnabled) - return; - - MSG msg; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } -} - -#endif diff --git a/pcsx2/SPU2/Windows/dsp.h b/pcsx2/SPU2/Windows/dsp.h deleted file mode 100644 index 67eeffa857..0000000000 --- a/pcsx2/SPU2/Windows/dsp.h +++ /dev/null @@ -1,57 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -// DSP plugin interface - -// notes: -// any window that remains in foreground should optimally pass unused -// keystrokes to the parent (winamp's) window, so that the user -// can still control it. As for storing configuration, -// Configuration data should be stored in \plugin.ini -// (look at the vis plugin for configuration code) - -#pragma once - -typedef struct winampDSPModule -{ - char* description; // description - HWND hwndParent; // parent window (filled in by calling app) - HINSTANCE hDllInstance; // instance handle to this DLL (filled in by calling app) - - void (*Config)(struct winampDSPModule* this_mod); // configuration dialog (if needed) - int (*Init)(struct winampDSPModule* this_mod); // 0 on success, creates window, etc (if needed) - - // modify waveform samples: returns number of samples to actually write - // (typically numsamples, but no more than twice numsamples, and no less than half numsamples) - // numsamples should always be at least 128. should, but I'm not sure - int (*ModifySamples)(struct winampDSPModule* this_mod, short int* samples, int numsamples, int bps, int nch, int srate); - - void (*Quit)(struct winampDSPModule* this_mod); // called when unloading - - void* userData; // user data, optional -} winampDSPModule; - -typedef struct -{ - int version; // DSP_HDRVER - char* description; // description of library - winampDSPModule* (*getModule)(int); // module retrieval function -} winampDSPHeader; - -// exported symbols -typedef winampDSPHeader* (*winampDSPGetHeaderType)(); - -// header version: 0x20 == 0.20 == winamp 2.0 -#define DSP_HDRVER 0x20 diff --git a/pcsx2/SPU2/Windows/resource.h b/pcsx2/SPU2/Windows/resource.h deleted file mode 100644 index 32c75f3c5e..0000000000 --- a/pcsx2/SPU2/Windows/resource.h +++ /dev/null @@ -1,64 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by SPU2.rc -#define IDD_CONFIG 9 -#define IDD_DEBUG 105 -#define IDD_CONFIG_SOUNDTOUCH 117 -#define IDD_CONFIG_DEBUG 118 -#define IDD_CUBEB 119 -#define IDC_DUMPREGS 1003 -#define IDC_DUMPMEM 1004 -#define IDC_DUMPCORE 1005 -#define IDC_LOGWAVE 1006 -#define IDC_LOGDMA 1007 -#define IDC_LOGREGS 1008 -#define IDC_DEBUG 1009 -#define IDC_DEBUG_ENABLE 1010 -#define IDC_INTERPOLATE 1011 -#define IDC_OUTPUT 1013 -#define IDC_BUFFERS_SLIDER 1014 -#define IDC_SPEAKERS 1015 -#define IDC_SPEAKERS_TEXT 1016 -#define IDC_MSGKEY 1020 -#define IDC_MSGDMA 1021 -#define IDC_MSGADMA 1022 -#define IDC_MSGVOICE 1023 -#define IDC_MSGSHOW 1024 -#define IDC_OUTCONF 1028 -#define IDC_DSP_ENABLE 1029 -#define IDC_DS_DEVICE 1032 -#define IDC_DBG_OVERRUNS 1038 -#define IDC_DBG_CACHE 1039 -#define IDC_LATENCY_SLIDER 1040 -#define IDC_LATENCY_LABEL 1041 -#define ICD_LR_CENTER_SLIDER 1042 -#define IDC_SEQLEN_SLIDER 1043 -#define IDC_SEEKWIN_SLIDER 1044 -#define IDC_OVERLAP_SLIDER 1045 -#define IDC_MSG_PUBLIC_BUILD 1048 -#define IDC_RESET_DEFAULTS 1057 -#define IDC_OPEN_CONFIG_SOUNDTOUCH 1058 -#define IDC_OPEN_CONFIG_DEBUG 1059 -#define IDC_GLOBALFOCUS_DISABLE 1060 -#define IDC_GLOBALFOCUS_DISABLE2 1061 -#define IDC_USE_HARDWARE 1062 -#define IDC_SYNCHMODE 1064 -#define IDC_DEBUG_OTHERS 1065 -#define IDC_DEBUG_VISUAL 1066 -#define IDC_VOLUME_LABEL 1067 -#define IDC_VOLUME_SLIDER 1068 -#define IDC_MINIMIZE 1069 -#define IDC_MANUAL 1070 -#define IDC_BACKEND 1071 -#define IDC_LATENCY 1072 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 120 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1074 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/pcsx2/SPU2/wx/wxConfig.cpp b/pcsx2/SPU2/wx/wxConfig.cpp deleted file mode 100644 index 9465ec7ca6..0000000000 --- a/pcsx2/SPU2/wx/wxConfig.cpp +++ /dev/null @@ -1,490 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "SPU2/Config.h" -#if !defined(_WIN32) // BSD, Macos -#include "SPU2/Linux/Config.h" -#include "SPU2/Linux/Dialogs.h" -#endif -#include "SPU2/Global.h" -#include "wxConfig.h" - -static const wchar_t* s_backend_names[][2] = { - {L"Automatic", L""}, -#ifdef __linux__ - {L"ALSA", L"alsa"}, - {L"JACK", L"jack"}, - {L"PulseAudio", L"pulseaudio"}, -#elif defined(__APPLE__) - {L"AudioUnit", L"audiounit"}, -#endif -}; - -MixerTab::MixerTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) -{ - auto* top_box = new wxBoxSizer(wxVERTICAL); - - // Mixing Settings - top_box->Add(new wxStaticText(this, wxID_ANY, "Interpolation"), wxSizerFlags().Centre()); - - wxArrayString interpolation_entries; - interpolation_entries.Add("Nearest (Fastest / worst quality)"); - interpolation_entries.Add("Linear (Simple / okay sound)"); - interpolation_entries.Add("Cubic (Fake highs / okay sound)"); - interpolation_entries.Add("Hermite (Better highs / okay sound)"); - interpolation_entries.Add("Catmull-Rom (PS2-like / good sound)"); - interpolation_entries.Add("Gaussian (PS2-like / great sound)"); - - m_inter_select = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, interpolation_entries); - - // Latency Slider - const int min_latency = SynchMode == 0 ? LATENCY_MIN_TIMESTRETCH : LATENCY_MIN; - - m_latency_box = new wxStaticBoxSizer(wxVERTICAL, this, "Latency"); - m_latency_slider = new wxSlider(this, wxID_ANY, SndOutLatencyMS, min_latency, LATENCY_MAX, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); - m_latency_box->Add(m_latency_slider, wxSizerFlags().Expand()); - - // Volume Slider - m_volume_box = new wxStaticBoxSizer(wxVERTICAL, this, "Volume"); - m_volume_slider = new wxSlider(this, wxID_ANY, FinalVolume * 100, 0, 200, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); - m_volume_box->Add(m_volume_slider, wxSizerFlags().Expand()); - - m_audio_box = new wxBoxSizer(wxVERTICAL); - m_audio_box->Add(new wxStaticText(this, wxID_ANY, "Audio Expansion Mode"), wxSizerFlags().Centre()); - - wxArrayString audio_entries; - audio_entries.Add("Stereo (None, Default)"); - audio_entries.Add("Quadrafonic"); - audio_entries.Add("Surround 5.1"); - audio_entries.Add("Surround 7.1"); - m_audio_select = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, audio_entries); - m_audio_box->Add(m_audio_select, wxSizerFlags().Expand()); - - top_box->Add(m_inter_select, wxSizerFlags().Centre()); - top_box->Add(m_latency_box, wxSizerFlags().Expand()); - top_box->Add(m_volume_box, wxSizerFlags().Expand()); - top_box->Add(m_audio_box, wxSizerFlags().Expand()); - - SetSizerAndFit(top_box); -} - -void MixerTab::Load() -{ - m_inter_select->SetSelection(Interpolation); - - m_audio_select->SetSelection(numSpeakers); - - m_volume_slider->SetValue(FinalVolume * 100); - m_latency_slider->SetValue(SndOutLatencyMS); -} - -void MixerTab::Save() -{ - Interpolation = m_inter_select->GetSelection(); - - numSpeakers = m_audio_select->GetSelection(); - - FinalVolume = m_volume_slider->GetValue() / 100.0; - SndOutLatencyMS = m_latency_slider->GetValue(); -} - -void MixerTab::Update() -{ -} - -void MixerTab::CallUpdate(wxCommandEvent& /*event*/) -{ - Update(); -} - -SyncTab::SyncTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) -{ - auto* top_box = new wxBoxSizer(wxVERTICAL); - - top_box->Add(new wxStaticText(this, wxID_ANY, "Synchronization"), wxSizerFlags().Centre()); - - wxArrayString sync_entries; - sync_entries.Add("TimeStretch (Recommended)"); - sync_entries.Add("Async Mix (Breaks some games!)"); - sync_entries.Add("None (Audio can skip.)"); - m_sync_select = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, sync_entries); - - auto* adv_box = new wxStaticBoxSizer(wxVERTICAL, this, "Advanced"); - - auto* babble_label = new wxStaticText(this, wxID_ANY, - "For fine-tuning time stretching.\n" - "Larger is better for slowdown, && smaller for speedup (60+ fps).\n" - "All options in microseconds.", - wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL); - babble_label->Wrap(300); - - adv_box->Add(babble_label, wxSizerFlags().Centre()); - - auto* soundtouch_grid = new wxFlexGridSizer(2, 10, 50); - - seq_spin = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, SoundtouchCfg::SequenceLen_Min, SoundtouchCfg::SequenceLen_Max, SoundtouchCfg::SequenceLenMS); - auto* seq_label = new wxStaticText(this, wxID_ANY, "Sequence Length"); - - seek_spin = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, SoundtouchCfg::SeekWindow_Min, SoundtouchCfg::SeekWindow_Max, SoundtouchCfg::SeekWindowMS); - auto* seek_label = new wxStaticText(this, wxID_ANY, "Seek Window Size"); - - overlap_spin = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, SoundtouchCfg::Overlap_Min, SoundtouchCfg::Overlap_Max, SoundtouchCfg::OverlapMS); - auto* overlap_label = new wxStaticText(this, wxID_ANY, "Overlap"); - - soundtouch_grid->Add(seq_label, wxSizerFlags().Border(wxALL, 5)); - soundtouch_grid->Add(seq_spin, wxSizerFlags().Expand().Right()); - soundtouch_grid->Add(seek_label, wxSizerFlags().Border(wxALL, 5)); - soundtouch_grid->Add(seek_spin, wxSizerFlags().Expand().Right()); - soundtouch_grid->Add(overlap_label, wxSizerFlags().Border(wxALL, 5)); - soundtouch_grid->Add(overlap_spin, wxSizerFlags().Expand().Right()); - - adv_box->Add(soundtouch_grid); - - reset_button = new wxButton(this, wxID_ANY, "Reset To Defaults"); - adv_box->Add(reset_button, wxSizerFlags().Centre().Border(wxALL, 5)); - - top_box->Add(m_sync_select, wxSizerFlags().Centre()); - top_box->Add(adv_box, wxSizerFlags().Expand().Centre()); - SetSizerAndFit(top_box); - Bind(wxEVT_BUTTON, &SyncTab::OnButtonClicked, this); - Bind(wxEVT_CHOICE, &SyncTab::CallUpdate, this); -} - -void SyncTab::Load() -{ - m_sync_select->SetSelection(SynchMode); - - SoundtouchCfg::ReadSettings(); - seq_spin->SetValue(SoundtouchCfg::SequenceLenMS); - seek_spin->SetValue(SoundtouchCfg::SeekWindowMS); - overlap_spin->SetValue(SoundtouchCfg::OverlapMS); -} - -void SyncTab::Save() -{ - SynchMode = m_sync_select->GetSelection(); - - SoundtouchCfg::SequenceLenMS = seq_spin->GetValue(); - SoundtouchCfg::SeekWindowMS = seek_spin->GetValue(); - SoundtouchCfg::OverlapMS = overlap_spin->GetValue(); - SoundtouchCfg::WriteSettings(); -} - -void SyncTab::Update() -{ - seq_spin->Enable(m_sync_select->GetCurrentSelection() == 0); - seek_spin->Enable(m_sync_select->GetCurrentSelection() == 0); - overlap_spin->Enable(m_sync_select->GetCurrentSelection() == 0); -} - -void SyncTab::CallUpdate(wxCommandEvent& /*event*/) -{ - Update(); -} - -void SyncTab::OnButtonClicked(wxCommandEvent& event) -{ - seq_spin->SetValue(30); - seek_spin->SetValue(20); - overlap_spin->SetValue(10); -} - -DebugTab::DebugTab(wxWindow* parent) - : wxPanel(parent, wxID_ANY) -{ - auto* top_box = new wxBoxSizer(wxVERTICAL); - - debug_check = new wxCheckBox(this, wxID_ANY, "Enable Debug Options"); - show_check = new wxCheckBox(this, wxID_ANY, "Show in console"); - top_box->Add(debug_check, wxSizerFlags().Expand()); - top_box->Add(show_check); - - m_console_box = new wxStaticBoxSizer(wxVERTICAL, this, "Events"); - auto* console_grid = new wxFlexGridSizer(2, 0, 0); - - key_check = new wxCheckBox(this, wxID_ANY, "Key On/Off"); - voice_check = new wxCheckBox(this, wxID_ANY, "Voice Stop"); - dma_check = new wxCheckBox(this, wxID_ANY, "DMA Operations"); - autodma_check = new wxCheckBox(this, wxID_ANY, "AutoDMA Operations"); - buffer_check = new wxCheckBox(this, wxID_ANY, "Buffer Over/Underruns"); - adpcm_check = new wxCheckBox(this, wxID_ANY, "ADPCM Cache"); - - console_grid->Add(key_check); - console_grid->Add(voice_check); - console_grid->Add(dma_check); - console_grid->Add(autodma_check); - console_grid->Add(buffer_check); - console_grid->Add(adpcm_check); - m_console_box->Add(console_grid); - - m_log_only_box = new wxStaticBoxSizer(wxVERTICAL, this, "Log Only"); - auto* log_grid = new wxFlexGridSizer(2, 0, 0); - - dma_actions_check = new wxCheckBox(this, wxID_ANY, "Register/DMA Actions"); - dma_writes_check = new wxCheckBox(this, wxID_ANY, "DMA Writes"); - auto_output_check = new wxCheckBox(this, wxID_ANY, "Audio Output"); - - log_grid->Add(dma_actions_check); - log_grid->Add(dma_writes_check); - log_grid->Add(auto_output_check); - m_log_only_box->Add(log_grid); - - dump_box = new wxStaticBoxSizer(wxVERTICAL, this, "Dump on Close"); - auto* dump_grid = new wxFlexGridSizer(2, 0, 0); - - core_voice_check = new wxCheckBox(this, wxID_ANY, "Core && Voice Stats"); - memory_check = new wxCheckBox(this, wxID_ANY, "Memory Contents"); - register_check = new wxCheckBox(this, wxID_ANY, "Register Data"); - dump_grid->Add(core_voice_check); - dump_grid->Add(memory_check); - dump_grid->Add(register_check); - dump_box->Add(dump_grid); - - top_box->Add(m_console_box, wxSizerFlags().Expand()); - top_box->Add(m_log_only_box, wxSizerFlags().Expand()); - top_box->Add(dump_box, wxSizerFlags().Expand()); - - SetSizerAndFit(top_box); - Bind(wxEVT_CHECKBOX, &DebugTab::CallUpdate, this); -} - -void DebugTab::Load() -{ - debug_check->SetValue(DebugEnabled); - - show_check->SetValue(_MsgToConsole); - key_check->SetValue(_MsgKeyOnOff); - voice_check->SetValue(_MsgVoiceOff); - dma_check->SetValue(_MsgDMA); - autodma_check->SetValue(_MsgAutoDMA); - buffer_check->SetValue(_MsgOverruns); - adpcm_check->SetValue(_MsgCache); - - dma_actions_check->SetValue(_AccessLog); - dma_writes_check->SetValue(_DMALog); - auto_output_check->SetValue(_WaveLog); - - core_voice_check->SetValue(_CoresDump); - memory_check->SetValue(_MemDump); - register_check->SetValue(_RegDump); - Update(); -} - -void DebugTab::Save() -{ - DebugEnabled = debug_check->GetValue(); - - _MsgToConsole = show_check->GetValue(); - _MsgKeyOnOff = key_check->GetValue(); - _MsgVoiceOff = voice_check->GetValue(); - _MsgDMA = dma_check->GetValue(); - _MsgAutoDMA = autodma_check->GetValue(); - _MsgOverruns = buffer_check->GetValue(); - _MsgCache = adpcm_check->GetValue(); - - _AccessLog = dma_actions_check->GetValue(); - _DMALog = dma_writes_check->GetValue(); - _WaveLog = auto_output_check->GetValue(); - - _CoresDump = core_voice_check->GetValue(); - _MemDump = memory_check->GetValue(); - _RegDump = register_check->GetValue(); -} - -void DebugTab::Update() -{ - if (debug_check->GetValue()) - { - show_check->Enable(); - - key_check->Enable(); - voice_check->Enable(); - dma_check->Enable(); - autodma_check->Enable(); - buffer_check->Enable(); - adpcm_check->Enable(); - - dma_actions_check->Enable(); - dma_writes_check->Enable(); - auto_output_check->Enable(); - - core_voice_check->Enable(); - memory_check->Enable(); - register_check->Enable(); - } - else - { - show_check->Disable(); - - key_check->Disable(); - voice_check->Disable(); - dma_check->Disable(); - autodma_check->Disable(); - buffer_check->Disable(); - adpcm_check->Disable(); - - dma_actions_check->Disable(); - dma_writes_check->Disable(); - auto_output_check->Disable(); - - core_voice_check->Disable(); - memory_check->Disable(); - register_check->Disable(); - } -} - -void DebugTab::CallUpdate(wxCommandEvent& /*event*/) -{ - Update(); -} - -Dialog::Dialog() - : wxDialog(nullptr, wxID_ANY, "Audio Settings", wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) -{ - m_top_box = new wxBoxSizer(wxVERTICAL); - auto* module_box = new wxBoxSizer(wxVERTICAL); - - // Module - module_box->Add(new wxStaticText(this, wxID_ANY, "Module"), wxSizerFlags().Centre()); - - wxArrayString module_entries; - module_entries.Add("No Sound (Emulate SPU2 only)"); -#ifdef SPU2X_CUBEB - module_entries.Add("Cubeb (Cross-platform)"); -#endif - m_module_select = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, module_entries); - module_box->Add(m_module_select, wxSizerFlags().Centre()); - -#ifdef SPU2X_CUBEB - // Portaudio - m_cubeb_box = new wxBoxSizer(wxVERTICAL); - m_cubeb_text = new wxStaticText(this, wxID_ANY, "Backend"); - m_cubeb_box->Add(m_cubeb_text, wxSizerFlags().Centre()); - - m_cubeb_select = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize); - for (size_t i = 0; i < std::size(s_backend_names); i++) - m_cubeb_select->Append(s_backend_names[i][0]); - m_cubeb_box->Add(m_cubeb_select, wxSizerFlags().Centre()); -#endif - -#ifdef SPU2X_CUBEB - module_box->Add(m_cubeb_box, wxSizerFlags().Expand()); -#endif - - m_top_box->Add(module_box, wxSizerFlags().Centre().Border(wxALL, 5)); - - auto* book = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_mixer_panel = new MixerTab(book); - m_sync_panel = new SyncTab(book); - m_debug_panel = new DebugTab(book); - - book->AddPage(m_mixer_panel, "Mixing", true); - book->AddPage(m_sync_panel, "Sync"); - book->AddPage(m_debug_panel, "Debug"); - - m_top_box->Add(book, wxSizerFlags().Centre()); - m_top_box->Add(CreateStdDialogButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Right()); - - SetSizerAndFit(m_top_box); - - Bind(wxEVT_CHOICE, &Dialog::CallReconfigure, this); - Bind(wxEVT_CHECKBOX, &Dialog::CallReconfigure, this); -} - -Dialog::~Dialog() -{ -} - -void Dialog::Reconfigure() -{ - const int mod = m_module_select->GetCurrentSelection(); - bool show_cubeb = false; - - switch (mod) - { - case 0: - show_cubeb = false; - break; - - case 1: - show_cubeb = true; - break; - - default: - show_cubeb = false; - break; - } -#ifdef SPU2X_CUBEB - m_top_box->Show(m_cubeb_box, show_cubeb, true); -#endif - - // Recalculating both of these accounts for if neither was showing initially. - m_top_box->Layout(); - SetSizerAndFit(m_top_box); -} - -void Dialog::CallReconfigure(wxCommandEvent& event) -{ - Reconfigure(); -} - -void Dialog::Load() -{ - m_module_select->SetSelection(OutputModule); -#ifdef SPU2X_CUBEB - wxString backend; - CfgReadStr(L"Cubeb", L"BackendName", backend, L""); - for (size_t i = 0; i < std::size(s_backend_names); i++) - { - if (backend == s_backend_names[i][1]) - { - m_cubeb_select->SetSelection(static_cast(i)); - break; - } - } -#endif - - m_mixer_panel->Load(); - m_sync_panel->Load(); - m_debug_panel->Load(); - - Reconfigure(); -} - -void Dialog::Save() -{ - OutputModule = m_module_select->GetSelection(); - -#ifdef SPU2X_CUBEB - const int backend_selection = m_cubeb_select->GetSelection(); - if (backend_selection >= 0) - CfgWriteStr(L"Cubeb", L"BackendName", s_backend_names[backend_selection][1]); -#endif - - m_mixer_panel->Save(); - m_sync_panel->Save(); - m_debug_panel->Save(); -} - -// Main -void Dialog::Display() -{ - Load(); - if (ShowModal() == wxID_OK) - Save(); -} diff --git a/pcsx2/SPU2/wx/wxConfig.h b/pcsx2/SPU2/wx/wxConfig.h deleted file mode 100644 index 8f25ee02f7..0000000000 --- a/pcsx2/SPU2/wx/wxConfig.h +++ /dev/null @@ -1,97 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include -#include -#include - -#if defined(__unix__) || defined(__APPLE__) -#include -#include -#include "Config.h" -#endif - -class MixerTab : public wxPanel -{ -public: - wxChoice *m_inter_select, *m_audio_select; - wxSlider *m_latency_slider, *m_volume_slider; - wxStaticBoxSizer *m_volume_box, *m_latency_box; - wxBoxSizer* m_audio_box; - - MixerTab(wxWindow* parent); - void Load(); - void Save(); - void Update(); - void CallUpdate(wxCommandEvent& event); -}; - -class SyncTab : public wxPanel -{ -public: - wxChoice* m_sync_select; - wxButton *launch_adv_dialog, *reset_button; - wxSpinCtrl *seq_spin, *seek_spin, *overlap_spin; - - SyncTab(wxWindow* parent); - void Load(); - void Save(); - void Update(); - void CallUpdate(wxCommandEvent& event); - void OnButtonClicked(wxCommandEvent& event); -}; - -class DebugTab : public wxPanel -{ -public: - wxCheckBox* debug_check; - wxButton* launch_debug_dialog; - - wxStaticBoxSizer *m_console_box, *m_log_only_box, *dump_box; - wxCheckBox* show_check; - wxCheckBox *key_check, *voice_check, *dma_check, *autodma_check, *buffer_check, *adpcm_check; - wxCheckBox *dma_actions_check, *dma_writes_check, *auto_output_check; - wxCheckBox *core_voice_check, *memory_check, *register_check; - - DebugTab(wxWindow* parent); - void Load(); - void Save(); - void Update(); - void CallUpdate(wxCommandEvent& event); -}; - -class Dialog : public wxDialog -{ - wxBoxSizer *m_top_box, *m_cubeb_box; - wxChoice *m_module_select, *m_cubeb_select; - wxStaticText *m_cubeb_text; - - MixerTab* m_mixer_panel; - SyncTab* m_sync_panel; - DebugTab* m_debug_panel; - -public: - Dialog(); - ~Dialog(); - void Display(); - void Load(); - void Save(); - void Reconfigure(); - void CallReconfigure(wxCommandEvent& event); -}; diff --git a/pcsx2/USB/USBNull.cpp b/pcsx2/USB/USBNull.cpp deleted file mode 100644 index 9c7d7b5695..0000000000 --- a/pcsx2/USB/USBNull.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "USBNull.h" - -void USBconfigure() {} - -s32 USBinit() { return 0; } -void USBasync(u32 cycles) {} -void USBshutdown() {} -void USBclose() {} -void USBreset() {} -s32 USBopen(const WindowInfo& wi) { return 0; } -s32 USBfreeze(FreezeAction mode, freezeData* data) { return 0; } - -u8 USBread8(u32 addr) { return 0; } -u16 USBread16(u32 addr) { return 0; } -u32 USBread32(u32 addr) { return 0; } -void USBwrite8(u32 addr, u8 value) {} -void USBwrite16(u32 addr, u16 value) {} -void USBwrite32(u32 addr, u32 value) {} diff --git a/pcsx2/USB/USBNull.h b/pcsx2/USB/USBNull.h deleted file mode 100644 index 2148c002a7..0000000000 --- a/pcsx2/USB/USBNull.h +++ /dev/null @@ -1,42 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include -#include - -#include "SaveState.h" - -struct WindowInfo; - -void USBconfigure(); - -s32 USBinit(); -void USBasync(u32 cycles); -void USBshutdown(); -void USBclose(); -void USBreset(); -s32 USBopen(const WindowInfo& wi); -s32 USBfreeze(FreezeAction mode, freezeData* data); - -u8 USBread8(u32 addr); -u16 USBread16(u32 addr); -u32 USBread32(u32 addr); -void USBwrite8(u32 addr, u8 value); -void USBwrite16(u32 addr, u16 value); -void USBwrite32(u32 addr, u32 value); diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h deleted file mode 100644 index 4505887a24..0000000000 --- a/pcsx2/gui/App.h +++ /dev/null @@ -1,737 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "wxAppWithHelpers.h" -#include "common/WindowInfo.h" - -#include -#include -#include - -#include "SysThreads.h" -#include "pxEventThread.h" - -#include "AppCommon.h" -#include "AppCoreThread.h" -#include "RecentIsoList.h" -#include "DriveList.h" - -class DisassemblyDialog; -struct HostKeyEvent; - -#include "GS.h" -#include "System.h" - -// TODO: Not the best location for this, but it needs to be accessed by MTGS etc. -extern WindowInfo g_gs_window_info; - -typedef void FnType_OnThreadComplete(const wxCommandEvent& evt); -typedef void (Pcsx2App::*FnPtr_Pcsx2App)(); - -wxDECLARE_EVENT(pxEvt_SetSettingsPage, wxCommandEvent); - -// This is used when GS is handling its own window. Messages from the PAD -// are piped through to an app-level message handler, which dispatches them through -// the universal Accelerator table. -static const int pxID_PadHandler_Keydown = 8030; - -// ID and return code used for modal popups that have a custom button. -static const wxWindowID pxID_CUSTOM = wxID_LOWEST - 1; - -// Return code used by first time wizard if the dialog needs to be automatically recreated -// (assigned an arbitrary value) -static const wxWindowID pxID_RestartWizard = wxID_LOWEST - 100; - - -// ------------------------------------------------------------------------ -// All Menu Options for the Main Window! :D -// ------------------------------------------------------------------------ - -enum TopLevelMenuIndices -{ - TopLevelMenu_Pcsx2 = 0, - TopLevelMenu_Cdvd, - TopLevelMenu_Config, - TopLevelMenu_Window, - TopLevelMenu_Capture, - TopLevelMenu_InputRecording, - TopLevelMenu_Help -}; - -enum MenuIdentifiers -{ - // Main Menu Section - MenuId_Boot = 1, - MenuId_Emulation, - MenuId_Config, // General config. - MenuId_Video, // Video options filled in by GS. - MenuId_Audio, // audio options filled in by SPU2. - MenuId_Misc, // Misc options and help! - - MenuId_Exit = wxID_EXIT, - MenuId_About = wxID_ABOUT, - - MenuId_EndTopLevel = 20, - - // Run SubSection - MenuId_Cdvd_Source, - MenuId_Src_Iso, - MenuId_Src_Disc, - MenuId_Src_NoDisc, - MenuId_Boot_Iso, // Opens submenu with Iso browser, and recent isos. - MenuId_RecentIsos_reservedStart, - MenuId_IsoBrowse = MenuId_RecentIsos_reservedStart + 100, // Open dialog, runs selected iso. - MenuId_IsoClear, - MenuId_IsoClearMissing, - MenuId_DriveSelector, - MenuId_DriveListRefresh, - MenuId_Ask_On_Booting, - MenuId_Boot_CDVD, - MenuId_Boot_CDVD2, - MenuId_Boot_ELF, - //MenuId_Boot_Recent, // Menu populated with recent source bootings - - - MenuId_Sys_SuspendResume, // suspends/resumes active emulation - MenuId_Sys_Shutdown, // Closes virtual machine, wipes states - MenuId_Sys_LoadStates, // Opens load states submenu - MenuId_Sys_SaveStates, // Opens save states submenu - MenuId_EnableBackupStates, // Checkbox to enable/disables savestates backup - MenuId_GameSettingsSubMenu, - MenuId_EnablePatches, - MenuId_EnableCheats, - MenuId_GSDump, - MenuId_EnableWideScreenPatches, - MenuId_EnableInputRecording, - MenuId_EnableLuaTools, - MenuId_EnableHostFs, - - MenuId_State_Load, - MenuId_State_LoadFromFile, - MenuId_State_Load01, // first of many load slots - MenuId_State_LoadBackup = MenuId_State_Load01 + 20, - MenuId_State_Save, - MenuId_State_SaveToFile, - MenuId_State_Save01, // first of many save slots - - MenuId_State_EndSlotSection = MenuId_State_Save01 + 20, - - // Config Subsection - MenuId_Config_SysSettings, - MenuId_Config_McdSettings, - MenuId_Config_AppSettings, - MenuId_Config_Language, - - MenuId_Config_GS, - MenuId_Config_PAD, - MenuId_Config_SPU2, - MenuId_Config_CDVD, - MenuId_Config_USB, - MenuId_Config_FireWire, - MenuId_Config_DEV9, - MenuId_Config_Patches, - - MenuId_Config_Multitap0Toggle, - MenuId_Config_Multitap1Toggle, - MenuId_Config_FastBoot, - - MenuId_Help_GetStarted, - MenuId_Help_Compatibility, - MenuId_Help_Forums, - MenuId_Help_Website, - MenuId_Help_Wiki, - MenuId_Help_Github, - - MenuId_Video_CoreSettings = 0x200, // includes frame timings and skippings settings - MenuId_Video_WindowSettings, - - // Miscellaneous Menu! (Misc) - MenuId_Console, // Enable console - MenuId_ChangeLang, // Change language (resets first time wizard to show on next start) - MenuId_Console_Stdio, // Enable Stdio - - // Debug Subsection - MenuId_Debug_Open, // opens the debugger window / starts a debug session - MenuId_Debug_MemoryDump, - MenuId_Debug_Logging, // dialog for selection additional log options - MenuId_Debug_CreateBlockdump, - MenuId_Config_ResetAll, - - // Capture Subsection - MenuId_Capture_Video, - MenuId_Capture_Video_Record, - MenuId_Capture_Video_Stop, - MenuId_Capture_Video_IncludeAudio, - MenuId_Capture_Screenshot, - MenuId_Capture_Screenshot_Screenshot, - MenuId_Capture_Screenshot_Screenshot_As, - - // Input Recording Subsection - MenuId_Recording_New, - MenuId_Recording_Play, - MenuId_Recording_Stop, - MenuId_Recording_Settings, - MenuId_Recording_Config_FrameAdvance, - MenuId_Recording_TogglePause, - MenuId_Recording_FrameAdvance, - MenuId_Recording_ToggleRecordingMode, - MenuId_Recording_VirtualPad_Port0, - MenuId_Recording_VirtualPad_Port1, - - // Subsection - MenuId_PINE, - MenuId_PINE_Enable, - MenuId_PINE_Settings, - -}; - -// -------------------------------------------------------------------------------------- -// AppImageIds - Config and Toolbar Images and Icons -// -------------------------------------------------------------------------------------- -struct AppImageIds -{ - struct ConfigIds - { - int Paths, - Speedhacks, - Gamefixes, - MemoryCard, - Video, - Cpu; - - ConfigIds() - { - Paths = - Speedhacks = Gamefixes = - Video = Cpu = - MemoryCard = -1; - } - } Config; - - struct ToolbarIds - { - int Settings, - Play, - Resume; - - ToolbarIds() - { - Settings = -1; - Play = -1; - Resume = -1; - } - } Toolbars; -}; - -// ------------------------------------------------------------------------------------------- -// pxAppResources -// ------------------------------------------------------------------------------------------- -// Container class for resources that should (or must) be unloaded prior to the ~wxApp() destructor. -// (typically this object is deleted at OnExit() or just prior to OnExit()). -// -class pxAppResources -{ -public: - AppImageIds ImageId; - - std::unique_ptr ConfigImages; - std::unique_ptr ToolbarImages; - std::unique_ptr IconBundle; - std::unique_ptr Bitmap_Logo; - std::unique_ptr ScreenshotBitmap; - - pxAppResources(); - virtual ~pxAppResources(); -}; - -class StartupOptions -{ -public: - bool ForceWizard; - bool ForceConsole; - bool PortableMode; - - // Disables the fast boot option when auto-running games. This option only applies - // if SysAutoRun is also true. - bool NoFastBoot; - - // Specifies the Iso file to boot; used only if SysAutoRun is enabled and CdvdSource - // is set to ISO. - wxString IsoFile; - - wxString ElfFile; - - wxString GameLaunchArgs; - - // Specifies the CDVD source type to use when AutoRunning - CDVD_SourceType CdvdSource; - - // Indicates if PCSX2 should autorun the configured CDVD source and/or ISO file. - bool SysAutoRun; - bool SysAutoRunElf; - bool SysAutoRunIrx; - - StartupOptions() - { - ForceWizard = false; - ForceConsole = false; - PortableMode = false; - NoFastBoot = false; - SysAutoRun = false; - SysAutoRunElf = false; - SysAutoRunIrx = false; - CdvdSource = CDVD_SourceType::NoDisc; - } -}; - -enum GsWindowMode_t -{ - GsWinMode_Unspecified = 0, - GsWinMode_Windowed, - GsWinMode_Fullscreen, -}; - -class CommandlineOverrides -{ -public: - wxDirName SettingsFolder; - wxFileName VmSettingsFile; - - bool DisableSpeedhacks; - bool ProfilingMode; - - // Note that gamefixes in this array should only be honored if the - // "HasCustomGamefixes" boolean is also enabled. - Pcsx2Config::GamefixOptions Gamefixes; - bool ApplyCustomGamefixes; - - GsWindowMode_t GsWindowMode; - -public: - CommandlineOverrides() - { - DisableSpeedhacks = false; - ApplyCustomGamefixes = false; - GsWindowMode = GsWinMode_Unspecified; - ProfilingMode = false; - } - - // Returns TRUE if either speedhacks or gamefixes are being overridden. - bool HasCustomHacks() const - { - return DisableSpeedhacks || ApplyCustomGamefixes; - } - - void RemoveCustomHacks() - { - DisableSpeedhacks = false; - ApplyCustomGamefixes = false; - } - - bool HasSettingsOverride() const - { - return SettingsFolder.IsOk() || VmSettingsFile.IsOk(); - } - -}; - -// ===================================================================================================== -// Pcsx2App - main wxApp class -// ===================================================================================================== -class Pcsx2App : public wxAppWithHelpers -{ - typedef wxAppWithHelpers _parent; - - // ---------------------------------------------------------------------------- - // Event Sources! - // These need to be at the top of the App class, because a lot of other things depend - // on them and they are, themselves, fairly self-contained. - -protected: - EventSource m_evtsrc_CoreThreadStatus; - EventSource m_evtsrc_AppStatus; - -public: - void AddListener(IEventListener_CoreThread& listener) - { - m_evtsrc_CoreThreadStatus.Add(listener); - } - - void AddListener(IEventListener_AppStatus& listener) - { - m_evtsrc_AppStatus.Add(listener); - } - - void RemoveListener(IEventListener_CoreThread& listener) - { - m_evtsrc_CoreThreadStatus.Remove(listener); - } - - void RemoveListener(IEventListener_AppStatus& listener) - { - m_evtsrc_AppStatus.Remove(listener); - } - - void AddListener(IEventListener_CoreThread* listener) - { - m_evtsrc_CoreThreadStatus.Add(listener); - } - - void AddListener(IEventListener_AppStatus* listener) - { - m_evtsrc_AppStatus.Add(listener); - } - - void RemoveListener(IEventListener_CoreThread* listener) - { - m_evtsrc_CoreThreadStatus.Remove(listener); - } - - void RemoveListener(IEventListener_AppStatus* listener) - { - m_evtsrc_AppStatus.Remove(listener); - } - - void DispatchEvent(AppEventType evt); - void DispatchEvent(CoreThreadStatus evt); - void DispatchUiSettingsEvent(IniInterface& ini); - void DispatchVmSettingsEvent(IniInterface& ini); - - bool HasGUI() { return m_UseGUI; }; - bool ExitPromptWithNoGUI() { return m_NoGuiExitPrompt; }; - - // ---------------------------------------------------------------------------- -protected: - int m_PendingSaves; - bool m_ScheduledTermination; - bool m_UseGUI; - bool m_NoGuiExitPrompt; - - Threading::Mutex m_mtx_Resources; - Threading::Mutex m_mtx_LoadingGameDB; - -public: - std::unique_ptr GlobalCommands; - std::unique_ptr GlobalAccels; - - StartupOptions Startup; - CommandlineOverrides Overrides; - - std::unique_ptr m_timer_Termination; - -protected: - std::unique_ptr m_StdoutRedirHandle; - std::unique_ptr m_StderrRedirHandle; - - std::unique_ptr m_RecentIsoList; - std::unique_ptr m_DriveList; - std::unique_ptr m_Resources; - -public: - // Executor Thread for complex VM/System tasks. This thread is used to execute such tasks - // in parallel to the main message pump, to allow the main pump to run without fear of - // blocked threads stalling the GUI. - ExecutorThread SysExecutorThread; - std::unique_ptr m_CpuProviders; - std::unique_ptr m_VmReserve; - -protected: - wxWindowID m_id_MainFrame; - wxWindowID m_id_GsFrame; - wxWindowID m_id_ProgramLogBox; - wxWindowID m_id_Disassembler; - wxWindowID m_id_NewRecordingFrame; - - wxKeyEvent m_kevt; - -public: - Pcsx2App(); - virtual ~Pcsx2App(); - - void PostMenuAction(MenuIdentifiers menu_id) const; - void PostAppMethod(FnPtr_Pcsx2App method); - void PostIdleAppMethod(FnPtr_Pcsx2App method); - - void SysApplySettings(); - void SysExecute(); - void SysExecute(CDVD_SourceType cdvdsrc, const wxString& elf_override = wxEmptyString); - void LogicalVsync(); - - SysMainMemory& GetVmReserve(); - - GSFrame& GetGsFrame() const; - MainEmuFrame& GetMainFrame() const; - - GSFrame* GetGsFramePtr() const { return (GSFrame*)wxWindow::FindWindowById(m_id_GsFrame); } - MainEmuFrame* GetMainFramePtr() const { return (MainEmuFrame*)wxWindow::FindWindowById(m_id_MainFrame); } - DisassemblyDialog* GetDisassemblyPtr() const { return (DisassemblyDialog*)wxWindow::FindWindowById(m_id_Disassembler); } - - void enterDebugMode(); - void leaveDebugMode(); - void resetDebugger(); - - bool HasMainFrame() const { return GetMainFramePtr() != NULL; } - - void OpenGsPanel(); - void CloseGsPanel(); - void OnGsFrameClosed(wxWindowID id); - void OnGsFrameDestroyed(wxWindowID id); - void OnMainFrameClosed(wxWindowID id); - - // -------------------------------------------------------------------------- - // Startup / Shutdown Helpers - // -------------------------------------------------------------------------- - - void DetectCpuAndUserMode(); - void OpenProgramLog(); - void OpenMainFrame(); - void PrepForExit(); - void CleanupRestartable(); - void CleanupResources(); - void WipeUserModeSettings(); - bool TestUserPermissionsRights(const wxDirName& testFolder, wxString& createFailedStr, wxString& accessFailedStr); - void EstablishAppUserMode(); - void ForceFirstTimeWizardOnNextRun(); - - wxConfigBase* OpenInstallSettingsFile(); - wxConfigBase* TestForPortableInstall(); - - bool HasPendingSaves() const; - void StartPendingSave(); - void ClearPendingSave(); - - // -------------------------------------------------------------------------- - // App-wide Resources - // -------------------------------------------------------------------------- - // All of these accessors cache the resources on first use and retain them in - // memory until the program exits. - - wxMenu& GetRecentIsoMenu(); - RecentIsoManager& GetRecentIsoManager(); - wxMenu& GetDriveListMenu(); - - pxAppResources& GetResourceCache(); - const wxIconBundle& GetIconBundle(); - const wxBitmap& GetLogoBitmap(); - const wxBitmap& GetScreenshotBitmap(); - wxImageList& GetImgList_Config(); - wxImageList& GetImgList_Toolbars(); - - const AppImageIds& GetImgId() const; - - // -------------------------------------------------------------------------- - // Overrides of wxApp virtuals: - // -------------------------------------------------------------------------- - wxAppTraits* CreateTraits(); - bool OnInit(); - int OnExit(); - void CleanUp(); - - void OnInitCmdLine(wxCmdLineParser& parser); - bool OnCmdLineParsed(wxCmdLineParser& parser); - bool OnCmdLineError(wxCmdLineParser& parser); - bool ParseOverrides(wxCmdLineParser& parser); - -#ifdef __WXDEBUG__ - void OnAssertFailure(const wxChar* file, int line, const wxChar* func, const wxChar* cond, const wxChar* msg); -#endif - - Threading::MutexRecursive m_mtx_ProgramLog; - ConsoleLogFrame* m_ptr_ProgramLog; - - // ---------------------------------------------------------------------------- - // Console / Program Logging Helpers - // ---------------------------------------------------------------------------- - ConsoleLogFrame* GetProgramLog(); - const ConsoleLogFrame* GetProgramLog() const; - void ProgramLog_PostEvent(wxEvent& evt); - Threading::Mutex& GetProgramLogLock(); - - void EnableAllLogging(); - void DisableWindowLogging() const; - void DisableDiskLogging() const; - void OnProgramLogClosed(wxWindowID id); - -protected: - bool AppRpc_TryInvoke(FnPtr_Pcsx2App method); - bool AppRpc_TryInvokeAsync(FnPtr_Pcsx2App method); - - void AllocateCoreStuffs(); - void InitDefaultGlobalAccelerators(); - void BuildCommandHash(); - bool TryOpenConfigCwd(); - void CleanupOnExit(); - void OpenWizardConsole(); - void PadKeyDispatch(const HostKeyEvent& ev); - -protected: - void HandleEvent(wxEvtHandler* handler, wxEventFunction func, wxEvent& event) const; - void HandleEvent(wxEvtHandler* handler, wxEventFunction func, wxEvent& event); - - void OnScheduledTermination(wxTimerEvent& evt); - void OnEmuKeyDown(wxKeyEvent& evt); - void OnSysExecutorTaskTimeout(wxTimerEvent& evt); - void OnDestroyWindow(wxWindowDestroyEvent& evt); - - // ---------------------------------------------------------------------------- - // Override wx default exception handling behavior - // ---------------------------------------------------------------------------- - - // Just rethrow exceptions in the main loop, so that we can handle them properly in our - // custom catch clauses in OnRun(). (ranting note: wtf is the point of this functionality - // in wx? Why would anyone ever want a generic catch-all exception handler that *isn't* - // the unhandled exception handler? Using this as anything besides a re-throw is terrible - // program design and shouldn't even be allowed -- air) - bool OnExceptionInMainLoop() { throw; } - - // Just rethrow unhandled exceptions to cause immediate debugger fail. - void OnUnhandledException() { throw; } -}; - - -wxDECLARE_APP(Pcsx2App); - -// -------------------------------------------------------------------------------------- -// s* macros! ['s' stands for 'shortcut'] -// -------------------------------------------------------------------------------------- -// Use these for "silent fail" invocation of PCSX2 Application-related constructs. If the -// construct (albeit wxApp, MainFrame, CoreThread, etc) is null, the requested method will -// not be invoked, and an optional "else" clause can be affixed for handling the end case. -// -// Usage Examples: -// sMainFrame.ApplySettings(); -// sMainFrame.ApplySettings(); else Console.WriteLn( "Judge Wapner" ); // 'else' clause for handling NULL scenarios. -// -// Note! These macros are not "syntax complete", which means they could generate unexpected -// syntax errors in some situations, and more importantly, they cannot be used for invoking -// functions with return values. -// -// Rationale: There are a lot of situations where we want to invoke a void-style method on -// various volatile object pointers (App, Corethread, MainFrame, etc). Typically if these -// objects are NULL the most intuitive response is to simply ignore the call request and -// continue running silently. These macros make that possible without any extra boilerplate -// conditionals or temp variable defines in the code. -// -#define sApp \ - if (Pcsx2App* __app_ = (Pcsx2App*)wxApp::GetInstance()) \ - (*__app_) - -#define sLogFrame \ - if (ConsoleLogFrame* __conframe_ = wxGetApp().GetProgramLog()) \ - (*__conframe_) - -#define sMainFrame \ - if (MainEmuFrame* __frame_ = GetMainFramePtr()) \ - (*__frame_) - -// Use this within the scope of a wxWindow (wxDialog or wxFrame). If the window has a valid menu -// bar, the command will run, otherwise it will be silently ignored. :) -#define sMenuBar \ - if (wxMenuBar* __menubar_ = GetMenuBar()) \ - (*__menubar_) - -// -------------------------------------------------------------------------------------- -// AppOpenDialog -// -------------------------------------------------------------------------------------- -// Returns a wxWindow handle to the opened window. -// -template -wxWindow* AppOpenDialog(wxWindow* parent = NULL) -{ - wxWindow* window = wxFindWindowByName(L"Dialog:" + DialogType::GetNameStatic()); - - if (!window) - window = new DialogType(parent); - - window->Show(); - window->SetFocus(); - return window; -} - -// -------------------------------------------------------------------------------------- -// AppOpenModalDialog -// -------------------------------------------------------------------------------------- -// Returns the ID of the button used to close the dialog. -// -template -int AppOpenModalDialog(wxString panel_name, wxWindow* parent = NULL) -{ - if (wxWindow* window = wxFindWindowByName(L"Dialog:" + DialogType::GetNameStatic())) - { - window->SetFocus(); - if (wxDialog* dialog = wxDynamicCast(window, wxDialog)) - { - // Switch to the requested panel. - if (panel_name != wxEmptyString) - { - wxCommandEvent evt(pxEvt_SetSettingsPage); - evt.SetString(panel_name); - dialog->GetEventHandler()->ProcessEvent(evt); - } - - // It's legal to call ShowModal on a non-modal dialog, therefore making - // it modal in nature for the needs of whatever other thread of action wants - // to block against it: - if (!dialog->IsModal()) - { - int result = dialog->ShowModal(); - dialog->Destroy(); - return result; - } - } - pxFailDev("Can only show wxDialog class windows as modal!"); - return wxID_CANCEL; - } - else - return DialogType(parent).ShowModal(); -} - -// -------------------------------------------------------------------------------------- -// External App-related Globals and Shortcuts -// -------------------------------------------------------------------------------------- - -extern bool SysHasValidState(); -extern void SysUpdateIsoSrcFile(const wxString& newIsoFile); -extern void SysUpdateDiscSrcDrive(const wxString& newDiscDrive); -extern void SysStatus(const wxString& text); - -extern bool HasMainFrame(); -extern MainEmuFrame& GetMainFrame(); -extern MainEmuFrame* GetMainFramePtr(); - -alignas(16) extern AppCoreThread CoreThread; -alignas(16) extern SysMtgsThread mtgsThread; - -extern void UI_UpdateSysControls(); - -extern void UI_DisableStateActions(); -extern void UI_EnableStateActions(); - -extern void UI_DisableSysActions(); -extern void UI_EnableSysActions(); - -extern void UI_DisableSysShutdown(); - -#define AffinityAssert_AllowFrom_SysExecutor() \ - pxAssertMsg(wxGetApp().SysExecutorThread.IsSelf(), "Thread affinity violation: Call allowed from SysExecutor thread only.") - -#define AffinityAssert_DisallowFrom_SysExecutor() \ - pxAssertMsg(!wxGetApp().SysExecutorThread.IsSelf(), "Thread affinity violation: Call is *not* allowed from SysExecutor thread.") - -extern ExecutorThread& GetSysExecutorThread(); - -extern bool g_ConfigPanelChanged; //Indicates that the main config panel is open and holds unapplied changes. diff --git a/pcsx2/gui/AppAccelerators.h b/pcsx2/gui/AppAccelerators.h deleted file mode 100644 index a097fdb271..0000000000 --- a/pcsx2/gui/AppAccelerators.h +++ /dev/null @@ -1,183 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "AppCommon.h" - -#include -#include - -// -------------------------------------------------------------------------------------- -// KeyAcceleratorCode -// A custom keyboard accelerator that I like better than wx's wxAcceleratorEntry. -// -------------------------------------------------------------------------------------- -struct KeyAcceleratorCode -{ - union - { - struct - { - u16 keycode; - u16 win : 1, // win32 only. - cmd : 1, // ctrl in win32, Command in Mac - alt : 1, - shift : 1; - }; - u32 val32; - }; - - KeyAcceleratorCode() - : val32(0) - { - } - KeyAcceleratorCode(const wxKeyEvent& evt); - - //grab event attributes only - KeyAcceleratorCode(const wxAcceleratorEntry& right) - { - val32 = 0; - keycode = right.GetKeyCode(); - if (right.GetFlags() & wxACCEL_ALT) - Alt(); - if (right.GetFlags() & wxACCEL_CMD) - Cmd(); - if (right.GetFlags() & wxACCEL_SHIFT) - Shift(); - } - - KeyAcceleratorCode(wxKeyCode code) - { - val32 = 0; - keycode = code; - } - - KeyAcceleratorCode(u32 value) - { - val32 = value; - } - - KeyAcceleratorCode& Shift(bool enabled = true) - { - shift = enabled; - return *this; - } - - KeyAcceleratorCode& Alt(bool enabled = true) - { - alt = enabled; - return *this; - } - - KeyAcceleratorCode& Win(bool enabled = true) - { - win = enabled; - return *this; - } - - KeyAcceleratorCode& Cmd(bool enabled = true) - { - cmd = enabled; - return *this; - } - - wxString ToString() const; - - // Capitalizes the key portion of an accelerator code for displaying to the UI - // ie. Shift-a becomes Shift-A / Ctrl+Shift+a becomes Ctrl+Shift+A - wxString toTitleizedString() const - { - if (val32 == 0) - return wxEmptyString; - - std::vector tokens; - wxStringTokenizer tokenizer(ToString(), "+"); - while (tokenizer.HasMoreTokens()) - tokens.push_back(tokenizer.GetNextToken()); - - if (tokens.size() == 1) - return tokens.at(0); - else if (tokens.size() < 1) - return wxEmptyString; - - wxString lastToken = tokens.at(tokens.size() - 1); - // If the final token is a key that is multiple characters. For example 'Tab' or 'Esc'. There is no need to modify it - // Otherwise, it could be a normal letter key, so we capitalize it for stylistic reasons. - if (lastToken.Length() == 1) - { - tokens.at(tokens.size() - 1) = lastToken[0] = wxToupper(lastToken[0]); - } - wxString modifiedKeyCode; - for (int i = 0; i < (int)tokens.size(); i++) - { - if (i == (int)(tokens.size() - 1)) - modifiedKeyCode.append(tokens.at(i)); - else - modifiedKeyCode.append(wxString::Format("%s+", tokens.at(i))); - } - return modifiedKeyCode; - } -}; - - -// -------------------------------------------------------------------------------------- -// GlobalCommandDescriptor -// -------------------------------------------------------------------------------------- -// Describes a global command which can be invoked from the main GUI. - -struct GlobalCommandDescriptor -{ - const char* Id; // Identifier string - void (*Invoke)(); // Do it!! Do it NOW!!! - - const wxChar* Fullname; // Name displayed in pulldown menus - const wxChar* Tooltip; // text displayed in toolbar tooltips and menu status bars. - - bool AlsoApplyToGui; // Indicates that the GUI should be updated if possible. - - wxString keycodeString; -}; - -// -------------------------------------------------------------------------------------- -// CommandDictionary -// -------------------------------------------------------------------------------------- -class CommandDictionary : public std::unordered_map -{ - typedef std::unordered_map _parent; - -protected: -public: - using _parent::operator[]; - virtual ~CommandDictionary() = default; -}; - -// -------------------------------------------------------------------------------------- -// -// -------------------------------------------------------------------------------------- -class AcceleratorDictionary : public std::unordered_map -{ - typedef std::unordered_map _parent; - -protected: -public: - using _parent::operator[]; - - virtual ~AcceleratorDictionary() = default; - void Map(const KeyAcceleratorCode& acode, const char* searchfor); - // Searches the dictionary _by the value (command ID string)_ and returns - // the associated KeyAcceleratorCode. Do not expect constant time lookup - // Returns a blank KeyAcceleratorCode if nothing is found - KeyAcceleratorCode findKeycodeWithCommandId(const char* commandId); -}; diff --git a/pcsx2/gui/AppAssert.cpp b/pcsx2/gui/AppAssert.cpp deleted file mode 100644 index d17df1ad6d..0000000000 --- a/pcsx2/gui/AppAssert.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "common/Threading.h" -#include "StringHelpers.h" - -#include - -#if wxUSE_STACKWALKER -class StackDump : public wxStackWalker -{ -protected: - FastFormatUnicode m_stackTrace; - wxString m_srcFuncName; - bool m_ignoreDone; - int m_skipped; - -public: - StackDump( const char* src_function_name ) - { - if( src_function_name != NULL ) - m_srcFuncName = fromUTF8(src_function_name); - - m_ignoreDone = false; - m_skipped = 0; - } - - const wxChar* GetStackTrace() const { return m_stackTrace.c_str(); } - -protected: - virtual void OnStackFrame(const wxStackFrame& frame) - { - /*if( m_srcFuncName.IsEmpty() || m_srcFuncName == name ) - { - // FIXME: This logic isn't reliable yet. - // It's possible for our debug information to not match the function names returned by - // __pxFUNCTION__ (might happen in linux a lot, and could happen in win32 due to - // inlining on Dev aserts). The better approach is a system the queues up all the - // stacktrace info in individual wxStrings, and does a two-pass check -- first pass - // for the function name and, if not found, a second pass that just skips the first - // few stack entries. - - // It's important we only walk the stack once because Linux (argh, always linux!) has - // a really god aweful slow stack walker. - - // I'm not doing it right now because I've worked on this mess enough for one week. --air - - m_ignoreDone = true; - } - - if( !m_ignoreDone ) - { - m_skipped++; - return; - }*/ - - m_stackTrace.Write(pxsFmt( L"[%02d]", frame.GetLevel()-m_skipped).c_str()); - - if (!frame.GetName().IsEmpty()) - m_stackTrace.Write(pxsFmt( L" %-44s", WX_STR(frame.GetName()) ).c_str()); - else - m_stackTrace.Write(pxsFmt( L" 0x%-42p", frame.GetAddress() ).c_str()); - - if( frame.HasSourceLocation() ) - { - wxFileName wxfn(frame.GetFileName()); - - wxfn.SetVolume( wxEmptyString ); - for (int i = 0; i < 2 && wxfn.GetDirCount() > 0; ++i) - wxfn.RemoveDir(0); - - m_stackTrace.Write( L" %s:%d", WX_STR(wxfn.GetFullPath()), frame.GetLine() ); - } - - m_stackTrace.Write(L"\n"); - } -}; - -static wxString pxGetStackTrace( const char* calledFrom ) -{ - StackDump dump( calledFrom ); - dump.Walk( 3 ); - return dump.GetStackTrace(); -} -#endif - -#ifdef __WXDEBUG__ - -// This override of wx's implementation provides thread safe assertion message reporting. -// If we aren't on the main gui thread then the assertion message box needs to be passed -// off to the main gui thread via messages. -void Pcsx2App::OnAssertFailure( const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg ) -{ - // Re-entrant assertions are bad mojo -- trap immediately. - static thread_local int _reentrant_lock( 0 ); - RecursionGuard guard( _reentrant_lock ); - if( guard.IsReentrant() ) pxTrap(); - - std::string nfile(StringUtil::wxStringToUTF8String(file)); - std::string nfunc(StringUtil::wxStringToUTF8String(func)); - std::string ncond(StringUtil::wxStringToUTF8String(cond)); - std::string nmsg(StringUtil::wxStringToUTF8String(msg)); - pxOnAssertFail(nfile.c_str(), line, nfunc.c_str(), nmsg.empty() ? ncond.c_str() : nmsg.c_str()); -} - -#endif - -bool AppDoAssert( const DiagnosticOrigin& origin, const char *msg ) -{ - // Used to allow the user to suppress future assertions during this application's session. - static bool disableAsserts = false; - if( disableAsserts ) return false; - -#if wxUSE_STACKWALKER - wxString trace( pxGetStackTrace(origin.function) ); -#else - wxString trace( "Warning: Platform doesn't support wx stackwalker" ); -#endif - std::string dbgmsg( origin.ToString( msg ) ); - - wxMessageOutputDebug().Printf( "%s", dbgmsg.c_str() ); - - Console.Error( dbgmsg ); - Console.WriteLn( "%ls", WX_STR(trace) ); - - wxString windowmsg( L"Assertion failed: " ); - if( msg != NULL ) - windowmsg += msg; - else if( origin.condition != NULL ) - windowmsg += origin.condition; - - int retval = Msgbox::Assertion( windowmsg, StringUtil::UTF8StringToWxString(dbgmsg) + L"\nStacktrace:\n" + trace ); - - if( retval == wxID_YES ) return true; - if( retval == wxID_IGNORE ) disableAsserts = true; - - return false; -} diff --git a/pcsx2/gui/AppCommon.h b/pcsx2/gui/AppCommon.h deleted file mode 100644 index ab2e08c018..0000000000 --- a/pcsx2/gui/AppCommon.h +++ /dev/null @@ -1,34 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "common/SafeArray.h" -#include "common/EventSource.h" - -#include "gui/wxGuiTools.h" -#include "gui/PersistentThread.h" -#include "gui/pxRadioPanel.h" -#include "gui/pxCheckBox.h" -#include "gui/pxStaticText.h" -#include "gui/CheckedStaticBox.h" - -#include "AppForwardDefs.h" -#include "AppConfig.h" -#include "AppEventListeners.h" - -extern wxString AddAppName( const wxString& fmt ); -extern wxString AddAppName( const wxChar* fmt ); -extern wxString AddAppName( const char* fmt ); diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp deleted file mode 100644 index 487d895a52..0000000000 --- a/pcsx2/gui/AppConfig.cpp +++ /dev/null @@ -1,1395 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "MainFrame.h" -#include "IniInterface.h" -#include "common/FileSystem.h" -#include "common/SettingsWrapper.h" -#include "wxSettingsInterface.h" - -#include -#include "DebugTools/Debug.h" -#include -#include - -////////////////////////////////////////////////////////////////////////////////////////// -// PathDefs Namespace -- contains default values for various pcsx2 path names and locations. -// -// Note: The members of this namespace are intended for default value initialization only. -// Most of the time you should use the path folder assignments in Conf() instead, since those -// are user-configurable. -// -namespace PathDefs -{ - namespace Base - { - const wxDirName& Snapshots() - { - static const wxDirName retval(L"snaps"); - return retval; - } - - const wxDirName& Savestates() - { - static const wxDirName retval(L"sstates"); - return retval; - } - - const wxDirName& MemoryCards() - { - static const wxDirName retval(L"memcards"); - return retval; - } - - const wxDirName& Settings() - { - static const wxDirName retval(L"inis"); - return retval; - } - - const wxDirName& Logs() - { - static const wxDirName retval(L"logs"); - return retval; - } - - const wxDirName& Bios() - { - static const wxDirName retval(L"bios"); - return retval; - } - - const wxDirName& Cheats() - { - static const wxDirName retval(L"cheats"); - return retval; - } - - const wxDirName& CheatsWS() - { - static const wxDirName retval(L"cheats_ws"); - return retval; - } - - const wxDirName& Langs() - { - static const wxDirName retval(L"locale"); - return retval; - } - - const wxDirName& Dumps() - { - static const wxDirName retval(L"dumps"); - return retval; - } - - const wxDirName& Docs() - { - static const wxDirName retval(L"docs"); - return retval; - } - - const wxDirName& Resources() - { - static const wxDirName retval(L"resources"); - return retval; - } - - const wxDirName& Cache() - { - static const wxDirName retval(L"cache"); - return retval; - } - - const wxDirName& Textures() - { - static const wxDirName retval(L"textures"); - return retval; - } - }; - - // Specifies the root folder for the application install. - // (currently it's the CWD, but in the future I intend to move all binaries to a "bin" - // sub folder, in which case the approot will become "..") [- Air?] - - //The installer installs the folders which are relative to AppRoot (that's langs) - // relative to the exe folder, and not relative to cwd. So the exe should be default AppRoot. - avih - const wxDirName& AppRoot() - { - //AffinityAssert_AllowFrom_MainUI(); - /* - if (InstallationMode == InstallMode_Registered) - { - static const wxDirName cwdCache( (wxDirName)Path::Normalize(wxGetCwd()) ); - return cwdCache; - } - else if (InstallationMode == InstallMode_Portable) -*/ - if (InstallationMode == InstallMode_Registered || InstallationMode == InstallMode_Portable) - { - static const wxDirName appCache((wxDirName) - wxFileName(wxStandardPaths::Get().GetExecutablePath()) - .GetPath()); - return appCache; - } - else - pxFail("Unimplemented user local folder mode encountered."); - - static const wxDirName dotFail(L"."); - return dotFail; - } - - // Specifies the main configuration folder. - wxDirName GetUserLocalDataDir() - { - return wxDirName(wxStandardPaths::Get().GetUserLocalDataDir()); - } - - // Fetches the path location for user-consumable documents -- stuff users are likely to want to - // share with other programs: screenshots, memory cards, and savestates. - wxDirName GetDocuments(DocsModeType mode) - { - switch (mode) - { -#if defined(XDG_STD) || defined(__APPLE__) // Expected location for this kind of stuff on macOS - // Move all user data file into central configuration directory (XDG_CONFIG_DIR) - case DocsFolder_User: - return GetUserLocalDataDir(); -#else - case DocsFolder_User: - return (wxDirName)Path::CombineWx(wxStandardPaths::Get().GetDocumentsDir(), pxGetAppName()); -#endif - case DocsFolder_Custom: - return CustomDocumentsFolder; - - jNO_DEFAULT - } - - return wxDirName(); - } - - wxDirName GetDocuments() - { - return GetDocuments(DocsFolderMode); - } - - wxDirName GetProgramDataDir() - { -#ifdef __APPLE__ - return wxDirName(wxStandardPaths::Get().GetResourcesDir()); -#elif !defined(PCSX2_APP_DATADIR) - return AppRoot(); -#else - // Each linux distributions have his rules for path so we give them the possibility to - // change it with compilation flags. -- Gregory - return wxDirName(PCSX2_APP_DATADIR).MakeAbsolute(AppRoot().ToString()); -#endif - } - - wxDirName GetSnapshots() - { - return GetDocuments() + Base::Snapshots(); - } - - wxDirName GetBios() - { - return GetDocuments() + Base::Bios(); - } - - wxDirName GetCheats() - { - return GetDocuments() + Base::Cheats(); - } - - wxDirName GetCheatsWS() - { - return GetDocuments() + Base::CheatsWS(); - } - - wxDirName GetDocs() - { -#if !defined(PCSX2_APP_DOCDIR) - return AppRoot() + Base::Docs(); -#else - return wxDirName(PCSX2_APP_DOCDIR).MakeAbsolute(AppRoot().ToString()); -#endif - } - - wxDirName GetSavestates() - { - return GetDocuments() + Base::Savestates(); - } - - wxDirName GetMemoryCards() - { - return GetDocuments() + Base::MemoryCards(); - } - - wxDirName GetSettings() - { - return GetDocuments() + Base::Settings(); - } - - wxDirName GetLogs() - { - return GetDocuments() + Base::Logs(); - } - - wxDirName GetResources() - { - // ifdef is only needed here because mac doesn't put its resources in a subdirectory.. -#ifdef __APPLE__ - return wxDirName(wxStandardPaths::Get().GetResourcesDir()); -#else - return GetProgramDataDir() + Base::Resources(); -#endif - } - - wxDirName GetLangs() - { - return GetResources() + Base::Langs(); - } - - wxDirName GetCache() - { - return GetDocuments() + Base::Cache(); - } - - wxDirName GetTextures() - { - return GetDocuments() + Base::Textures(); - } - - wxDirName Get(FoldersEnum_t folderidx) - { - switch (folderidx) - { - case FolderId_Settings: - return GetSettings(); - case FolderId_Bios: - return GetBios(); - case FolderId_Snapshots: - return GetSnapshots(); - case FolderId_Savestates: - return GetSavestates(); - case FolderId_MemoryCards: - return GetMemoryCards(); - case FolderId_Logs: - return GetLogs(); - case FolderId_Langs: - return GetLangs(); - case FolderId_Cheats: - return GetCheats(); - case FolderId_CheatsWS: - return GetCheatsWS(); - case FolderId_Cache: - return GetCache(); - case FolderId_Textures: - return GetTextures(); - - case FolderId_Documents: - return CustomDocumentsFolder; - - jNO_DEFAULT - } - return wxDirName(); - } -}; // namespace PathDefs - - -// -------------------------------------------------------------------------------------- -// Default Filenames -// -------------------------------------------------------------------------------------- -namespace FilenameDefs -{ - wxFileName GetUiConfig() - { - return pxGetAppName() + L"_ui.ini"; - } - - wxFileName GetUiKeysConfig() - { - return pxGetAppName() + L"_keys.ini"; - } - - wxFileName GetVmConfig() - { - return pxGetAppName() + L"_vm.ini"; - } - - wxFileName GetUsermodeConfig() - { - return wxFileName(L"usermode.ini"); - } - - const wxFileName& Memcard(uint port, uint slot) - { - static const wxFileName retval[2][4] = - { - { - wxFileName(L"Mcd001.ps2"), - wxFileName(L"Mcd003.ps2"), - wxFileName(L"Mcd005.ps2"), - wxFileName(L"Mcd007.ps2"), - }, - { - wxFileName(L"Mcd002.ps2"), - wxFileName(L"Mcd004.ps2"), - wxFileName(L"Mcd006.ps2"), - wxFileName(L"Mcd008.ps2"), - }}; - - pxAssert(port < 2); - pxAssert(slot < 4); - - return retval[port][slot]; - } -}; // namespace FilenameDefs - -static wxDirName GetResolvedFolder(FoldersEnum_t id) -{ - return g_Conf->Folders.IsDefault(id) ? PathDefs::Get(id) : g_Conf->Folders[id]; -} - -static wxDirName GetSettingsFolder() -{ - if (wxGetApp().Overrides.SettingsFolder.IsOk()) - return wxGetApp().Overrides.SettingsFolder; - - return UseDefaultSettingsFolder ? PathDefs::GetSettings() : SettingsFolder; -} - -wxString GetVmSettingsFilename() -{ - wxFileName fname(wxGetApp().Overrides.VmSettingsFile.IsOk() ? wxGetApp().Overrides.VmSettingsFile : FilenameDefs::GetVmConfig()); - return GetSettingsFolder().Combine(fname).GetFullPath(); -} - -wxString GetUiSettingsFilename() -{ - wxFileName fname(FilenameDefs::GetUiConfig()); - return GetSettingsFolder().Combine(fname).GetFullPath(); -} - -wxString GetUiKeysFilename() -{ - wxFileName fname(FilenameDefs::GetUiKeysConfig()); - return GetSettingsFolder().Combine(fname).GetFullPath(); -} - -wxDirName& AppConfig::FolderOptions::operator[](FoldersEnum_t folderidx) -{ - switch (folderidx) - { - case FolderId_Settings: - return SettingsFolder; - case FolderId_Bios: - return Bios; - case FolderId_Snapshots: - return Snapshots; - case FolderId_Savestates: - return Savestates; - case FolderId_MemoryCards: - return MemoryCards; - case FolderId_Logs: - return Logs; - case FolderId_Langs: - return Langs; - case FolderId_Cheats: - return Cheats; - case FolderId_CheatsWS: - return CheatsWS; - case FolderId_Cache: - return Cache; - case FolderId_Textures: - return Textures; - - case FolderId_Documents: - return CustomDocumentsFolder; - - jNO_DEFAULT - } - return SettingsFolder; // unreachable, but suppresses warnings. -} - -const wxDirName& AppConfig::FolderOptions::operator[](FoldersEnum_t folderidx) const -{ - return const_cast(this)->operator[](folderidx); -} - -bool AppConfig::FolderOptions::IsDefault(FoldersEnum_t folderidx) const -{ - switch (folderidx) - { - case FolderId_Settings: - return UseDefaultSettingsFolder; - case FolderId_Bios: - return UseDefaultBios; - case FolderId_Snapshots: - return UseDefaultSnapshots; - case FolderId_Savestates: - return UseDefaultSavestates; - case FolderId_MemoryCards: - return UseDefaultMemoryCards; - case FolderId_Logs: - return UseDefaultLogs; - case FolderId_Langs: - return UseDefaultLangs; - case FolderId_Cheats: - return UseDefaultCheats; - case FolderId_CheatsWS: - return UseDefaultCheatsWS; - case FolderId_Cache: - return UseDefaultCache; - case FolderId_Textures: - return UseDefaultTextures; - - case FolderId_Documents: - return false; - - jNO_DEFAULT - } - return false; -} - -void AppConfig::FolderOptions::Set(FoldersEnum_t folderidx, const wxString& src, bool useDefault) -{ - switch (folderidx) - { - case FolderId_Settings: - SettingsFolder = src; - UseDefaultSettingsFolder = useDefault; - EmuFolders::Settings = GetSettingsFolder().ToUTF8(); - break; - - case FolderId_Bios: - Bios = src; - UseDefaultBios = useDefault; - EmuFolders::Bios = GetResolvedFolder(FolderId_Bios).ToUTF8(); - break; - - case FolderId_Snapshots: - Snapshots = src; - UseDefaultSnapshots = useDefault; - EmuFolders::Snapshots = GetResolvedFolder(FolderId_Snapshots).ToUTF8(); - break; - - case FolderId_Savestates: - Savestates = src; - UseDefaultSavestates = useDefault; - EmuFolders::Savestates = GetResolvedFolder(FolderId_Savestates).ToUTF8(); - break; - - case FolderId_MemoryCards: - MemoryCards = src; - UseDefaultMemoryCards = useDefault; - EmuFolders::MemoryCards = GetResolvedFolder(FolderId_MemoryCards).ToUTF8(); - break; - - case FolderId_Logs: - Logs = src; - UseDefaultLogs = useDefault; - EmuFolders::Logs = GetResolvedFolder(FolderId_Logs).ToUTF8(); - break; - - case FolderId_Langs: - Langs = src; - UseDefaultLangs = useDefault; - EmuFolders::Langs = GetResolvedFolder(FolderId_Langs).ToUTF8(); - break; - - case FolderId_Documents: - CustomDocumentsFolder = src; - break; - - case FolderId_Cheats: - Cheats = src; - UseDefaultCheats = useDefault; - EmuFolders::Cheats = GetResolvedFolder(FolderId_Cheats).ToUTF8(); - break; - - case FolderId_CheatsWS: - CheatsWS = src; - UseDefaultCheatsWS = useDefault; - EmuFolders::CheatsWS = GetResolvedFolder(FolderId_CheatsWS).ToUTF8(); - break; - - case FolderId_Cache: - Cache = src; - UseDefaultCache = useDefault; - EmuFolders::Cache = GetResolvedFolder(FolderId_Cache).ToUTF8(); - FileSystem::CreateDirectoryPath(EmuFolders::Cache.c_str(), false); - break; - - case FolderId_Textures: - Textures = src; - UseDefaultTextures = useDefault; - EmuFolders::Textures = GetResolvedFolder(FolderId_Textures).ToUTF8(); - FileSystem::CreateDirectoryPath(EmuFolders::Textures.c_str(), false); - break; - - jNO_DEFAULT - } -} - -bool IsPortable() -{ - return InstallationMode == InstallMode_Portable; -} - -AppConfig::AppConfig() - : MainGuiPosition(wxDefaultPosition) - , SysSettingsTabName(L"Cpu") - , McdSettingsTabName(L"none") - , AppSettingsTabName(L"none") - , GameDatabaseTabName(L"none") - , LanguageId(wxLANGUAGE_DEFAULT) - , LanguageCode(L"default") - , CdvdSource(CDVD_SourceType::Iso) -{ - RecentIsoCount = 20; - Listbook_ImageSize = 32; - Toolbar_ImageSize = 24; - Toolbar_ShowLabels = true; - - EnableSpeedHacks = true; - EnableGameFixes = false; - EnableFastBoot = true; - - DevMode = false; - - EnablePresets = true; - PresetIndex = 1; -} - -// ------------------------------------------------------------------------ -void App_LoadSaveInstallSettings(IniInterface& ini) -{ - // Portable installs of PCSX2 should not save any of the following information to - // the INI file. Only the Run First Time Wizard option is saved, and that's done - // from EstablishAppUserMode code. All other options have assumed (fixed) defaults in - // portable mode which cannot be changed/saved. - - // Note: Settins are still *loaded* from portable.ini, in case the user wants to do - // low-level overrides of the default behavior of portable mode installs. - - if (ini.IsSaving() && (InstallationMode == InstallMode_Portable)) - return; - - static const wxChar* DocsFolderModeNames[] = - { - L"User", - L"Custom", - // WARNING: array must be NULL terminated to compute it size - NULL}; - - ini.EnumEntry(L"DocumentsFolderMode", DocsFolderMode, DocsFolderModeNames, (InstallationMode == InstallMode_Registered) ? DocsFolder_User : DocsFolder_Custom); - - ini.Entry(L"CustomDocumentsFolder", CustomDocumentsFolder, PathDefs::AppRoot()); - - ini.Entry(L"UseDefaultSettingsFolder", UseDefaultSettingsFolder, true); - ini.Entry(L"SettingsFolder", SettingsFolder, PathDefs::GetSettings()); - - // "Install_Dir" conforms to the NSIS standard install directory key name. - ini.Entry(L"Install_Dir", InstallFolder, (wxDirName)(wxFileName(wxStandardPaths::Get().GetExecutablePath()).GetPath())); - SetFullBaseDir(InstallFolder); - - ini.Flush(); -} - -void App_LoadInstallSettings(wxConfigBase* ini) -{ - IniLoader loader(ini); - App_LoadSaveInstallSettings(loader); -} - -void App_SaveInstallSettings(wxConfigBase* ini) -{ - IniSaver saver(ini); - App_LoadSaveInstallSettings(saver); -} - -// ------------------------------------------------------------------------ -const wxChar* CDVD_SourceLabels[] = - { - L"ISO", - L"Disc", - L"NoDisc", - NULL}; - -void AppConfig::LoadSaveRootItems(IniInterface& ini) -{ - IniEntry(MainGuiPosition); - IniEntry(SysSettingsTabName); - IniEntry(McdSettingsTabName); - IniEntry(ComponentsTabName); - IniEntry(AppSettingsTabName); - IniEntry(GameDatabaseTabName); - ini.EnumEntry(L"LanguageId", LanguageId, NULL, LanguageId); - IniEntry(LanguageCode); - IniEntry(RecentIsoCount); - ini.Entry(wxT("GzipIsoIndexTemplate"), EmuConfig.GzipIsoIndexTemplate, EmuConfig.GzipIsoIndexTemplate); - IniEntry(Listbook_ImageSize); - IniEntry(Toolbar_ImageSize); - IniEntry(Toolbar_ShowLabels); - - wxFileName res(CurrentIso); - ini.Entry(L"CurrentIso", res, res, ini.IsLoading() || IsPortable()); - CurrentIso = res.GetFullPath(); - - ini.Entry(wxT("CurrentBlockdump"), EmuConfig.CurrentBlockdump, EmuConfig.CurrentBlockdump); - IniEntry(CurrentELF); - ini.Entry(wxT("CurrentIRX"), EmuConfig.CurrentIRX, EmuConfig.CurrentIRX); - - IniEntry(EnableSpeedHacks); - IniEntry(EnableGameFixes); - IniEntry(EnableFastBoot); - - IniEntry(EnablePresets); - IniEntry(PresetIndex); - IniEntry(AskOnBoot); - - IniEntry(DevMode); - - ini.EnumEntry(L"CdvdSource", CdvdSource, CDVD_SourceLabels, CdvdSource); - -#ifdef __WXMSW__ - ini.Entry(wxT("McdCompressNTFS"), EmuOptions.McdCompressNTFS, EmuOptions.McdCompressNTFS); -#endif -} - -// ------------------------------------------------------------------------ -void AppConfig::LoadSave(IniInterface& ini, SettingsWrapper& wrap) -{ - // do all the wx stuff first so it doesn't screw with the wrapper's path - LoadSaveRootItems(ini); - ProgLogBox.LoadSave(ini, L"ProgramLog"); - Folders.LoadSave(ini); - - GSWindow.LoadSave(ini); - inputRecording.loadSave(ini); - AudioCapture.LoadSave(ini); - Templates.LoadSave(ini); - - // Process various sub-components: - EmuOptions.LoadSaveMemcards(wrap); - EmuOptions.BaseFilenames.LoadSave(wrap); - EmuOptions.Framerate.LoadSave(wrap); - - ini.Flush(); -} - -// ------------------------------------------------------------------------ -AppConfig::ConsoleLogOptions::ConsoleLogOptions() - : DisplayPosition(wxDefaultPosition) - , DisplaySize(wxSize(680, 560)) - , Theme(L"Default") -{ - Visible = true; - AutoDock = true; - FontSize = 8; -} - -void AppConfig::ConsoleLogOptions::LoadSave(IniInterface& ini, const wxChar* logger) -{ - ScopedIniGroup path(ini, logger); - - IniEntry(Visible); - IniEntry(AutoDock); - IniEntry(DisplayPosition); - IniEntry(DisplaySize); - IniEntry(FontSize); - IniEntry(Theme); -} - -void AppConfig::FolderOptions::ApplyDefaults() -{ - if (UseDefaultBios) - Bios = PathDefs::GetBios(); - if (UseDefaultSnapshots) - Snapshots = PathDefs::GetSnapshots(); - if (UseDefaultSavestates) - Savestates = PathDefs::GetSavestates(); - if (UseDefaultMemoryCards) - MemoryCards = PathDefs::GetMemoryCards(); - if (UseDefaultLogs) - Logs = PathDefs::GetLogs(); - if (UseDefaultLangs) - Langs = PathDefs::GetLangs(); - if (UseDefaultCheats) - Cheats = PathDefs::GetCheats(); - if (UseDefaultCheatsWS) - CheatsWS = PathDefs::GetCheatsWS(); -} - -// ------------------------------------------------------------------------ -AppConfig::FolderOptions::FolderOptions() - : Bios(PathDefs::GetBios()) - , Snapshots(PathDefs::GetSnapshots()) - , Savestates(PathDefs::GetSavestates()) - , MemoryCards(PathDefs::GetMemoryCards()) - , Langs(PathDefs::GetLangs()) - , Logs(PathDefs::GetLogs()) - , Cheats(PathDefs::GetCheats()) - , CheatsWS(PathDefs::GetCheatsWS()) - , Resources(PathDefs::GetResources()) - , Cache(PathDefs::GetCache()) - - , RunIso(PathDefs::GetDocuments()) // raw default is always the Documents folder. - , RunELF(PathDefs::GetDocuments()) // raw default is always the Documents folder. - , RunDisc() -{ - bitset = 0xffffffff; -} - -void AppConfig::FolderOptions::LoadSave(IniInterface& ini) -{ - ScopedIniGroup path(ini, L"Folders"); - - if (ini.IsSaving()) - { - ApplyDefaults(); - } - - IniBitBool(UseDefaultBios); - IniBitBool(UseDefaultSnapshots); - IniBitBool(UseDefaultSavestates); - IniBitBool(UseDefaultMemoryCards); - IniBitBool(UseDefaultLogs); - IniBitBool(UseDefaultLangs); - IniBitBool(UseDefaultCheats); - IniBitBool(UseDefaultCheatsWS); - IniBitBool(UseDefaultTextures); - - //when saving in portable mode, we save relative paths if possible - // --> on load, these relative paths will be expanded relative to the exe folder. - bool rel = (ini.IsLoading() || IsPortable()); - - IniEntryDirFile(Bios, rel); - IniEntryDirFile(Snapshots, rel); - IniEntryDirFile(Savestates, rel); - IniEntryDirFile(MemoryCards, rel); - IniEntryDirFile(Logs, rel); - IniEntryDirFile(Langs, rel); - IniEntryDirFile(Cheats, rel); - IniEntryDirFile(CheatsWS, rel); - IniEntryDirFile(Cache, rel); - IniEntryDirFile(Textures, rel); - - IniEntryDirFile(RunIso, rel); - IniEntryDirFile(RunELF, rel); - IniEntry(RunDisc); - - if (ini.IsLoading()) - { - ApplyDefaults(); - - for (int i = 0; i < FolderId_COUNT; ++i) - operator[]((FoldersEnum_t)i).Normalize(); - - AppSetEmuFolders(); - } -} - -void AppSetEmuFolders() -{ - EmuFolders::Settings = GetSettingsFolder().ToUTF8(); - EmuFolders::Bios = GetResolvedFolder(FolderId_Bios).ToUTF8(); - EmuFolders::Snapshots = GetResolvedFolder(FolderId_Snapshots).ToUTF8(); - EmuFolders::Savestates = GetResolvedFolder(FolderId_Savestates).ToUTF8(); - EmuFolders::MemoryCards = GetResolvedFolder(FolderId_MemoryCards).ToUTF8(); - EmuFolders::Logs = GetResolvedFolder(FolderId_Logs).ToUTF8(); - EmuFolders::Langs = GetResolvedFolder(FolderId_Langs).ToUTF8(); - EmuFolders::Cheats = GetResolvedFolder(FolderId_Cheats).ToUTF8(); - EmuFolders::CheatsWS = GetResolvedFolder(FolderId_CheatsWS).ToUTF8(); - EmuFolders::Resources = g_Conf->Folders.Resources.ToUTF8(); - EmuFolders::Cache = GetResolvedFolder(FolderId_Cache).ToUTF8(); - EmuFolders::Textures = GetResolvedFolder(FolderId_Textures).ToUTF8(); - - // Ensure cache directory exists, since we're going to write to it (e.g. game database) - FileSystem::CreateDirectoryPath(EmuFolders::Cache.c_str(), false); -} - -// ------------------------------------------------------------------------ -AppConfig::GSWindowOptions::GSWindowOptions() - : WindowSize(wxSize(640, 480)) - , WindowPos(wxDefaultPosition) -{ - CloseOnEsc = true; - DefaultToFullscreen = false; - AlwaysHideMouse = false; - DisableResizeBorders = false; - DisableScreenSaver = true; - - IsMaximized = false; - IsFullscreen = false; - EnableVsyncWindowFlag = false; - - IsToggleFullscreenOnDoubleClick = true; -} - -void AppConfig::GSWindowOptions::SanityCheck() -{ - // Ensure Conformation of various options... - - WindowSize.x = std::max(WindowSize.x, 8); - WindowSize.x = std::min(WindowSize.x, wxGetDisplayArea().GetWidth() - 16); - - WindowSize.y = std::max(WindowSize.y, 8); - WindowSize.y = std::min(WindowSize.y, wxGetDisplayArea().GetHeight() - 48); - - // Make sure the upper left corner of the window is visible enought o grab and - // move into view: - if (!wxGetDisplayArea().Contains(wxRect(WindowPos, wxSize(48, 48)))) - WindowPos = wxDefaultPosition; -} - -void AppConfig::GSWindowOptions::LoadSave(IniInterface& ini) -{ - ScopedIniGroup path(ini, L"GSWindow"); - - IniEntry(CloseOnEsc); - IniEntry(DefaultToFullscreen); - IniEntry(AlwaysHideMouse); - IniEntry(DisableResizeBorders); - IniEntry(DisableScreenSaver); - - IniEntry(WindowSize); - IniEntry(WindowPos); - IniEntry(IsMaximized); - IniEntry(IsFullscreen); - IniEntry(EnableVsyncWindowFlag); - - IniEntry(IsToggleFullscreenOnDoubleClick); - - static const wxChar* AspectRatioNames[] = - { - L"Stretch", - L"Auto 4:3/3:2 (Progressive)", - L"4:3", - L"16:9", - // WARNING: array must be NULL terminated to compute it size - NULL}; - - g_Conf->EmuOptions.GS.SyncToHostRefreshRate = ini.EntryBitBool(L"SyncToHostRefreshRate", g_Conf->EmuOptions.GS.SyncToHostRefreshRate, g_Conf->EmuOptions.GS.SyncToHostRefreshRate); - ini.EnumEntry(L"AspectRatio", g_Conf->EmuOptions.GS.AspectRatio, AspectRatioNames, g_Conf->EmuOptions.GS.AspectRatio); - if (ini.IsLoading()) - EmuConfig.CurrentAspectRatio = g_Conf->EmuOptions.GS.AspectRatio; - - static const wxChar* FMVAspectRatioSwitchNames[] = - { - L"Off", - L"Auto 4:3/3:2 (Progressive)", - L"4:3", - L"16:9", - // WARNING: array must be NULL terminated to compute it size - NULL}; - ini.EnumEntry(L"FMVAspectRatioSwitch", g_Conf->EmuOptions.GS.FMVAspectRatioSwitch, FMVAspectRatioSwitchNames, g_Conf->EmuOptions.GS.FMVAspectRatioSwitch); - - if (ini.IsLoading()) - SanityCheck(); -} - -AppConfig::InputRecordingOptions::InputRecordingOptions() - : VirtualPadPosition(wxDefaultPosition) - , m_frame_advance_amount(1) -{ -} - -void AppConfig::InputRecordingOptions::loadSave(IniInterface& ini) -{ - ScopedIniGroup path(ini, L"InputRecording"); - - IniEntry(VirtualPadPosition); - IniEntry(m_frame_advance_amount); -} - -AppConfig::CaptureOptions::CaptureOptions() -{ - EnableAudio = true; -} - -void AppConfig::CaptureOptions::LoadSave(IniInterface& ini) -{ - ScopedIniGroup path(ini, L"Capture"); - - IniEntry(EnableAudio); -} - -AppConfig::UiTemplateOptions::UiTemplateOptions() - : LimiterUnlimited(L"Max") - , LimiterTurbo(L"Turbo") - , LimiterSlowmo(L"Slowmo") - , LimiterNormal(L"Normal") - , OutputFrame(L"Frame") - , OutputField(L"Field") - , OutputProgressive(L"Progressive") - , OutputInterlaced(L"Interlaced") - , Paused(L" ") - , TitleTemplate(L"Slot: ${slot} | Speed: ${speed} (${vfps}) | ${videomode} | Limiter: ${limiter} | ${gs} | ${omodei} | ${cpuusage}") - , RecordingTemplate(L"Slot: ${slot} | Frame: ${frame}/${maxFrame} | Rec. Mode: ${mode} | Speed: ${speed} (${vfps}) | Limiter: ${limiter}") -{ -} - -void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini) -{ - ScopedIniGroup path(ini, L"UiTemplates"); - - IniEntry(LimiterUnlimited); - IniEntry(LimiterTurbo); - IniEntry(LimiterSlowmo); - IniEntry(LimiterNormal); - IniEntry(OutputFrame); - IniEntry(OutputField); - IniEntry(OutputProgressive); - IniEntry(OutputInterlaced); - IniEntry(Paused); - IniEntry(TitleTemplate); - IniEntry(RecordingTemplate); -} - -int AppConfig::GetMaxPresetIndex() -{ - return 2; -} - -bool AppConfig::isOkGetPresetTextAndColor(int n, wxString& label, wxColor& c) -{ - const wxString presetNamesAndColors[][2] = - { - {_t("Safest (No hacks)"), L"Blue"}, - {_t("Safe (Default)"), L"Dark Green"}, - {_t("Balanced"), L"Forest Green"} - } ; - n = std::clamp(n, 0, GetMaxPresetIndex()); - - label = wxsFormat(L"%d - ", n + 1) + presetNamesAndColors[n][0]; - c = wxColor(presetNamesAndColors[n][1]); - - return true; -} - - -// Apply one of several (currently 6) configuration subsets. -// The scope of the subset which each preset controlls is hardcoded here. -// Use ignoreMTVU to avoid updating the MTVU field. -// Main purpose is for the preset enforcement at launch, to avoid overwriting a user's setting. -bool AppConfig::IsOkApplyPreset(int n, bool ignoreMTVU) -{ - if (n < 0 || n > GetMaxPresetIndex()) - { - Console.WriteLn("DEV Warning: ApplyPreset(%d): index out of range, Aborting.", n); - return false; - } - - //Console.WriteLn("Applying Preset %d ...", n); - - //Have some original and default values at hand to be used later. - Pcsx2Config::FramerateOptions original_Framerate = EmuOptions.Framerate; - Pcsx2Config::SpeedhackOptions original_SpeedHacks = EmuOptions.Speedhacks; - AppConfig default_AppConfig; - Pcsx2Config default_Pcsx2Config; - - // NOTE: Because the system currently only supports passing of an entire AppConfig to the GUI panels/menus to apply/reflect, - // the GUI entities should be aware of the settings which the presets control, such that when presets are used: - // 1. The panels/entities should prevent manual modifications (by graying out) of settings which the presets control. - // 2. The panels should not apply values which the presets don't control if the value is initiated by a preset. - // Currently controlled by the presets: - // - AppConfig: Framerate (except turbo/slowmo factors), EnableSpeedHacks, EnableGameFixes. - // - EmuOptions: Cpu, Gamefixes, SpeedHacks (except mtvu), EnablePatches, GS (except for FrameLimitEnable and VsyncEnable). - // - // This essentially currently covers all the options on all the panels except for framelimiter which isn't - // controlled by the presets, and the entire GSWindow panel which also isn't controlled by presets - // - // So, if changing the scope of the presets (making them affect more or less values), the relevant GUI entities - // should me modified to support it. - - - //Force some settings as a (current) base for all presets. - - EmuOptions.Framerate = default_Pcsx2Config.Framerate; - EmuOptions.Framerate.SlomoScalar = original_Framerate.SlomoScalar; - EmuOptions.Framerate.TurboScalar = original_Framerate.TurboScalar; - - EnableGameFixes = false; - - EmuOptions.EnablePatches = true; - - EmuOptions.GS.SynchronousMTGS = default_Pcsx2Config.GS.SynchronousMTGS; - - EmuOptions.Cpu = default_Pcsx2Config.Cpu; - EmuOptions.Gamefixes = default_Pcsx2Config.Gamefixes; - EmuOptions.Speedhacks = default_Pcsx2Config.Speedhacks; - EmuOptions.Speedhacks.bitset = 0; //Turn off individual hacks to make it visually clear they're not used. - EmuOptions.Speedhacks.vuThread = original_SpeedHacks.vuThread; - EmuOptions.Speedhacks.vu1Instant = original_SpeedHacks.vu1Instant; - EnableSpeedHacks = true; - - // Actual application of current preset over the base settings which all presets use (mostly pcsx2's default values). - - bool isMTVUSet = ignoreMTVU ? true : false; // used to prevent application of specific lower preset values on fallthrough. - switch (n) // Settings will waterfall down to the Safe preset, then stop. So, Balanced and higher will inherit any settings through Safe. - { - case 2: // Balanced - isMTVUSet ? 0 : (isMTVUSet = true, EmuOptions.Speedhacks.vuThread = true); // Enable MTVU - [[fallthrough]]; - - case 1: // Safe (Default) - EmuOptions.Speedhacks.IntcStat = true; - EmuOptions.Speedhacks.WaitLoop = true; - EmuOptions.Speedhacks.vuFlagHack = true; - EmuOptions.Speedhacks.vu1Instant = true; - - // If waterfalling from > Safe, break to avoid MTVU disable. - if (n > 1) - break; - [[fallthrough]]; - - case 0: // Safest - if (n == 0) - EmuOptions.Speedhacks.vu1Instant = false; - isMTVUSet ? 0 : (isMTVUSet = true, EmuOptions.Speedhacks.vuThread = false); // Disable MTVU - break; - - default: - Console.WriteLn("Developer Warning: Preset #%d is not implemented. (--> Using application default).", n); - } - - - EnablePresets = true; - PresetIndex = n; - - return true; -} - - -wxFileConfig* OpenFileConfig(const wxString& filename) -{ - return new wxFileConfig(wxEmptyString, wxEmptyString, filename, wxEmptyString, wxCONFIG_USE_RELATIVE_PATH); -} - -void RelocateLogfile() -{ - g_Conf->Folders.Logs.Mkdir(); - - std::string newlogname(StringUtil::wxStringToUTF8String(Path::CombineWx(g_Conf->Folders.Logs.ToString(), L"emuLog.txt"))); - - if ((emuLog != NULL) && (emuLogName != newlogname)) - { - Console.WriteLn("\nRelocating Logfile...\n\tFrom: %ls\n\tTo : %ls\n", emuLogName.c_str(), newlogname.c_str()); - wxGetApp().DisableDiskLogging(); - - fclose(emuLog); - emuLog = NULL; - } - - if (emuLog == NULL) - { - emuLogName = newlogname; - emuLog = FileSystem::OpenCFile(emuLogName.c_str(), "wb"); - } - - wxGetApp().EnableAllLogging(); -} - -// Parameters: -// overwrite - this option forces the current settings to overwrite any existing settings -// that might be saved to the configured ini/settings folder. -// -// Notes: -// The overwrite option applies to PCSX2 options only. -// -void AppConfig_OnChangedSettingsFolder(bool overwrite) -{ - PathDefs::GetDocuments().Mkdir(); - GetSettingsFolder().Mkdir(); - - const wxString iniFilename(GetUiSettingsFilename()); - - if (overwrite) - { - if (wxFileExists(iniFilename) && !wxRemoveFile(iniFilename)) - throw Exception::AccessDenied(StringUtil::wxStringToUTF8String(iniFilename)) - .SetBothMsgs("Failed to overwrite existing settings file; permission was denied."); - - const wxString vmIniFilename(GetVmSettingsFilename()); - - if (wxFileExists(vmIniFilename) && !wxRemoveFile(vmIniFilename)) - throw Exception::AccessDenied(StringUtil::wxStringToUTF8String(vmIniFilename)) - .SetBothMsgs("Failed to overwrite existing settings file; permission was denied."); - } - - // Bind into wxConfigBase to allow wx to use our config internally, and delete whatever - // comes out (cleans up prev config, if one). - delete wxConfigBase::Set(OpenFileConfig(iniFilename)); - GetAppConfig()->SetRecordDefaults(true); - - if (!overwrite) - AppLoadSettings(); - else - AppSetEmuFolders(); - - AppApplySettings(); - AppSaveSettings(); //Make sure both ini files are created if needed. -} - -// -------------------------------------------------------------------------------------- -// pxDudConfig -// -------------------------------------------------------------------------------------- -// Used to handle config actions prior to the creation of the ini file (for example, the -// first time wizard). Attempts to save ini settings are simply ignored through this -// class, which allows us to give the user a way to set everything up in the wizard, apply -// settings as usual, and only *save* something once the whole wizard is complete. -// -class pxDudConfig : public wxConfigBase -{ -protected: - wxString m_empty; - -public: - virtual ~pxDudConfig() = default; - - virtual void SetPath(const wxString&) {} - virtual const wxString& GetPath() const { return m_empty; } - - virtual bool GetFirstGroup(wxString&, long&) const { return false; } - virtual bool GetNextGroup(wxString&, long&) const { return false; } - virtual bool GetFirstEntry(wxString&, long&) const { return false; } - virtual bool GetNextEntry(wxString&, long&) const { return false; } - virtual size_t GetNumberOfEntries(bool) const { return 0; } - virtual size_t GetNumberOfGroups(bool) const { return 0; } - - virtual bool HasGroup(const wxString&) const { return false; } - virtual bool HasEntry(const wxString&) const { return false; } - - virtual bool Flush(bool) { return false; } - - virtual bool RenameEntry(const wxString&, const wxString&) { return false; } - - virtual bool RenameGroup(const wxString&, const wxString&) { return false; } - - virtual bool DeleteEntry(const wxString&, bool bDeleteGroupIfEmpty = true) { return false; } - virtual bool DeleteGroup(const wxString&) { return false; } - virtual bool DeleteAll() { return false; } - -protected: - virtual bool DoReadString(const wxString&, wxString*) const { return false; } - virtual bool DoReadLong(const wxString&, long*) const { return false; } - - virtual bool DoWriteString(const wxString&, const wxString&) { return false; } - virtual bool DoWriteLong(const wxString&, long) { return false; } - -#if wxUSE_BASE64 - virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const - { - return false; - } - virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) { return false; } -#endif -}; - -static pxDudConfig _dud_config; - -// -------------------------------------------------------------------------------------- -// AppIniSaver / AppIniLoader -// -------------------------------------------------------------------------------------- -class AppIniSaver : public IniSaver -{ -public: - AppIniSaver(); - virtual ~AppIniSaver() = default; -}; - -class AppIniLoader : public IniLoader -{ -public: - AppIniLoader(); - virtual ~AppIniLoader() = default; -}; - -AppIniSaver::AppIniSaver() - : IniSaver((GetAppConfig() != NULL) ? *GetAppConfig() : _dud_config) -{ -} - -AppIniLoader::AppIniLoader() - : IniLoader((GetAppConfig() != NULL) ? *GetAppConfig() : _dud_config) -{ -} - -static void LoadUiSettings() -{ - AppIniLoader loader; - ConLog_LoadSaveSettings(loader); - SysTraceLog_LoadSaveSettings(loader); - - { - wxSettingsInterface wxsi(&loader.GetConfig()); - SettingsLoadWrapper wrapper(wxsi); - g_Conf = std::make_unique(); - g_Conf->LoadSave(loader, wrapper); - } - - if (!wxFile::Exists(g_Conf->CurrentIso)) - { - g_Conf->CurrentIso.clear(); - } - - sApp.DispatchUiSettingsEvent(loader); -} - -static void LoadVmSettings() -{ - // Load virtual machine options and apply some defaults overtop saved items, which - // are regulated by the PCSX2 UI. - - std::unique_ptr vmini(OpenFileConfig(GetVmSettingsFilename())); - IniLoader vmloader(vmini.get()); - { - wxSettingsInterface wxsi(vmini.get()); - SettingsLoadWrapper vmwrapper(wxsi); - g_Conf->EmuOptions.LoadSave(vmwrapper); - g_Conf->EmuOptions.GS.LimitScalar = g_Conf->EmuOptions.Framerate.NominalScalar; - } - - if (g_Conf->EnablePresets) - { - g_Conf->IsOkApplyPreset(g_Conf->PresetIndex, true); - } - - sApp.DispatchVmSettingsEvent(vmloader); -} - -void AppLoadSettings() -{ - if (wxGetApp().Rpc_TryInvoke(AppLoadSettings)) - return; - - LoadUiSettings(); - LoadVmSettings(); -} - -static void SaveUiSettings() -{ - if (!wxFile::Exists(g_Conf->CurrentIso)) - { - g_Conf->CurrentIso.clear(); - } - - sApp.GetRecentIsoManager().Add(g_Conf->CurrentIso); - - AppIniSaver saver; - { - wxSettingsInterface wxsi(&saver.GetConfig()); - SettingsSaveWrapper wrapper(wxsi); - g_Conf->LoadSave(saver, wrapper); - } - ConLog_LoadSaveSettings(saver); - SysTraceLog_LoadSaveSettings(saver); - - sApp.DispatchUiSettingsEvent(saver); -} - -static void SaveVmSettings() -{ - std::unique_ptr vmini(OpenFileConfig(GetVmSettingsFilename())); - IniSaver vmsaver(vmini.get()); - { - wxSettingsInterface wxsi(vmini.get()); - SettingsSaveWrapper vmwrapper(wxsi); - g_Conf->EmuOptions.LoadSave(vmwrapper); - } - - sApp.DispatchVmSettingsEvent(vmsaver); -} - -void AppSaveSettings() -{ - // If multiple SaveSettings messages are requested, we want to ignore most of them. - // Saving settings once when the GUI is idle should be fine. :) - - static std::atomic isPosted(false); - - if (!wxThread::IsMain()) - { - if (!isPosted.exchange(true)) - wxGetApp().PostIdleMethod(AppSaveSettings); - - return; - } - - //Console.WriteLn("Saving ini files..."); - - SaveUiSettings(); - SaveVmSettings(); - - isPosted = false; -} - - -// Returns the current application configuration file. This is preferred over using -// wxConfigBase::GetAppConfig(), since it defaults to *not* creating a config file -// automatically (which is typically highly undesired behavior in our system) -wxConfigBase* GetAppConfig() -{ - return wxConfigBase::Get(false); -} - - -//Tests if a string is a valid name for a new file within a specified directory. -//returns true if: -// - the file name has a minimum length of minNumCharacters chars (default is 5 chars: at least 1 char + '.' + 3-chars extension) -// and - the file name is within the basepath directory (doesn't contain .. , / , \ , etc) -// and - file name doesn't already exist -// and - can be created on current system (it is actually created and deleted for this test). -bool isValidNewFilename(wxString filenameStringToTest, wxDirName atBasePath, wxString& out_errorMessage, uint minNumCharacters) -{ - if (filenameStringToTest.Length() < 1 || filenameStringToTest.Length() < minNumCharacters) - { - out_errorMessage = _("File name empty or too short"); - return false; - } - - if ((atBasePath + wxFileName(filenameStringToTest)).GetFullPath() != (atBasePath + wxFileName(filenameStringToTest).GetFullName()).GetFullPath()) - { - out_errorMessage = _("File name outside of required directory"); - return false; - } - - if (wxFileExists((atBasePath + wxFileName(filenameStringToTest)).GetFullPath())) - { - out_errorMessage = _("File name already exists"); - return false; - } - if (wxDirExists((atBasePath + wxFileName(filenameStringToTest)).GetFullPath())) - { - out_errorMessage = _("File name already exists"); - return false; - } - - wxFile fp; - if (!fp.Create((atBasePath + wxFileName(filenameStringToTest)).GetFullPath())) - { - out_errorMessage = _("The Operating-System prevents this file from being created"); - return false; - } - fp.Close(); - wxRemoveFile((atBasePath + wxFileName(filenameStringToTest)).GetFullPath()); - - out_errorMessage = L"[OK - New file name is valid]"; //shouldn't be displayed on success, hence not translatable. - return true; -} diff --git a/pcsx2/gui/AppConfig.h b/pcsx2/gui/AppConfig.h deleted file mode 100644 index ba7fc1875c..0000000000 --- a/pcsx2/gui/AppConfig.h +++ /dev/null @@ -1,339 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "AppForwardDefs.h" -#include "Config.h" -#include "PathDefs.h" -#include "CDVD/CDVDcommon.h" -#include "common/General.h" -#include "common/Path.h" - -#include -#include -#include - -class SettingsWrapper; - -enum DocsModeType -{ - // uses /home/user or /cwd for the program data. This is the default mode and is the most - // friendly to modern computing security requirements; as it isolates all file modification - // to a zone of the hard drive that has granted write permissions to the user. - DocsFolder_User, - - // uses a custom location for program data. Typically the custom folder is either the - // absolute or relative location of the program -- absolute is preferred because it is - // considered more secure by MSW standards, due to DLL search rules. - // - // To enable PCSX2's "portable" mode, use this setting and specify "." for the custom - // documents folder. - DocsFolder_Custom, -}; - -namespace PathDefs -{ - // complete pathnames are returned by these functions. - // These are used for initial default values when first configuring PCSX2, or when the - // user checks "Use Default paths" option provided on most path selectors. These are not - // used otherwise, in favor of the user-configurable specifications in the ini files. - - extern wxDirName GetUserLocalDataDir(); - extern wxDirName GetProgramDataDir(); - extern wxDirName GetDocuments(); - extern wxDirName GetDocuments( DocsModeType mode ); -} - -extern DocsModeType DocsFolderMode; // -extern bool UseDefaultSettingsFolder; // when TRUE, pcsx2 derives the settings folder from the DocsFolderMode - -extern wxDirName CustomDocumentsFolder; // allows the specification of a custom home folder for PCSX2 documents files. -extern wxDirName SettingsFolder; // dictates where the settings folder comes from, *if* UseDefaultSettingsFolder is FALSE. - -extern wxDirName InstallFolder; - -extern wxString GetVmSettingsFilename(); -extern wxString GetUiSettingsFilename(); -extern wxString GetUiKeysFilename(); - -enum InstallationModeType -{ - // Use the user defined folder selections. These can be anywhere on a user's hard drive, - // though by default thee user files (screenshots, inis) are in the user's documents - // folder. All folders are changable within the GUI. - InstallMode_Registered, - - // In this mode, both Install_Dir and UserDocuments folders default the directory containing - // PCSX2.exe, or the current working directory (if the PCSX2 directory could not be determined). - // Folders cannot be changed from within the gui, however the fixed defaults can be manually - // specified in the portable.ini by power users/devs. - // - // This mode is typically enabled by the presence of a 'portable.ini' in the folder. - InstallMode_Portable, -}; -bool IsPortable(); - -extern InstallationModeType InstallationMode; - -extern const wxChar* CDVD_SourceLabels[]; - -// ===================================================================================================== -// Pcsx2 Application Configuration. -// ===================================================================================================== - -class AppConfig -{ -public: - // ------------------------------------------------------------------------ - struct ConsoleLogOptions - { - bool Visible; - // if true, DisplayPos is ignored and the console is automatically docked to the main window. - bool AutoDock; - // Display position used if AutoDock is false (ignored otherwise) - wxPoint DisplayPosition; - wxSize DisplaySize; - - // Size of the font in points. - int FontSize; - - // Color theme by name! - wxString Theme; - - ConsoleLogOptions(); - void LoadSave( IniInterface& conf, const wxChar* title ); - }; - - // ------------------------------------------------------------------------ - struct FolderOptions - { - BITFIELD32() - bool - UseDefaultBios:1, - UseDefaultSnapshots:1, - UseDefaultSavestates:1, - UseDefaultMemoryCards:1, - UseDefaultLogs:1, - UseDefaultLangs:1, - UseDefaultCheats:1, - UseDefaultCheatsWS:1, - UseDefaultCache:1, - UseDefaultTextures:1; - BITFIELD_END - - wxDirName - Bios, - Snapshots, - Savestates, - MemoryCards, - Langs, - Logs, - Cheats, - CheatsWS, - Resources, - Cache, - Textures; - - wxDirName RunIso; // last used location for Iso loading. - wxDirName RunELF; // last used location for ELF loading. - wxString RunDisc; // last used location for Disc loading. - - FolderOptions(); - void LoadSave( IniInterface& conf ); - void ApplyDefaults(); - - void Set( FoldersEnum_t folderidx, const wxString& src, bool useDefault ); - - const wxDirName& operator[]( FoldersEnum_t folderidx ) const; - wxDirName& operator[]( FoldersEnum_t folderidx ); - bool IsDefault( FoldersEnum_t folderidx ) const; - }; - - // ------------------------------------------------------------------------ - // The GS window receives much love from the land of Options and Settings. - // - struct GSWindowOptions - { - // Closes the GS/Video port on escape (good for fullscreen activity) - bool CloseOnEsc; - bool DefaultToFullscreen; - bool AlwaysHideMouse; - bool DisableResizeBorders; - bool DisableScreenSaver; - - wxSize WindowSize; - wxPoint WindowPos; - - bool IsMaximized; - bool IsFullscreen; - bool EnableVsyncWindowFlag; - bool IsToggleFullscreenOnDoubleClick; - - GSWindowOptions(); - - void LoadSave( IniInterface& conf ); - void SanityCheck(); - }; - - struct InputRecordingOptions - { - wxPoint VirtualPadPosition; - int m_frame_advance_amount; - - InputRecordingOptions(); - void loadSave(IniInterface& conf); - }; - - struct UiTemplateOptions { - UiTemplateOptions(); - void LoadSave(IniInterface& conf); - - wxString LimiterUnlimited; - wxString LimiterTurbo; - wxString LimiterSlowmo; - wxString LimiterNormal; - wxString OutputFrame; - wxString OutputField; - wxString OutputProgressive; - wxString OutputInterlaced; - wxString Paused; - wxString TitleTemplate; - wxString RecordingTemplate; - }; - - struct CaptureOptions - { - bool EnableAudio; - - CaptureOptions(); - - void LoadSave(IniInterface& conf); - }; - -public: - wxPoint MainGuiPosition; - - // Because remembering the last used tab on the settings panel is cool (tab is remembered - // by it's UTF/ASCII name). - wxString SysSettingsTabName; - wxString McdSettingsTabName; - wxString ComponentsTabName; - wxString AppSettingsTabName; - wxString GameDatabaseTabName; - - // Currently selected language ID -- wxWidgets version-specific identifier. This is one side of - // a two-part configuration that also includes LanguageCode. - wxLanguage LanguageId; - - // Current language in use (correlates to the universal language codes, such as "en_US", "de_DE", etc). - // This code is not always unique, which is why we use the language ID also. - wxString LanguageCode; - - int RecentIsoCount; // number of files displayed in the Recent Isos list. - - // Specifies the size of icons used in Listbooks; specifically the PCSX2 Properties dialog box. - // Realistic values range from 96x96 to 24x24. - int Listbook_ImageSize; - - // Specifies the size of each toolbar icon, in pixels (any value >= 2 is valid, but realistically - // values should be between 64 and 16 for usability reasons) - int Toolbar_ImageSize; - - // Enables display of toolbar text labels. - bool Toolbar_ShowLabels; - - // Master toggle for enabling or disabling all speedhacks in one fail-free swoop. - // (the toggle is applied when a new EmuConfig is sent through AppCoreThread::ApplySettings) - bool EnableSpeedHacks; - bool EnableGameFixes; - bool EnableFastBoot; - - // Presets try to prevent users from overwhelming when they want to change settings (usually to make a game run faster). - // The presets allow to modify the balance between emulation accuracy and emulation speed using a pseudo-linear control. - // It's pseudo since there's no way to arrange groups of all of pcsx2's settings such that each next group makes it slighty faster and slightly less compatiible for all games. - //However, By carefully selecting these preset config groups, it's hopefully possible to achieve this goal for a reasonable percentage (hopefully above 50%) of the games. - //when presets are enabled, the user has practically no control over the emulation settings, and can only choose the preset to use. - - // The next 2 vars enable/disable presets alltogether, and select/reflect current preset, respectively. - bool EnablePresets; - int PresetIndex; - - bool AskOnBoot; - - bool DevMode; // Enable extra options in config menus - - - wxString CurrentIso; - wxString CurrentELF; - CDVD_SourceType CdvdSource; - - ConsoleLogOptions ProgLogBox; - FolderOptions Folders; - GSWindowOptions GSWindow; - InputRecordingOptions inputRecording; - UiTemplateOptions Templates; - CaptureOptions AudioCapture; - - // PCSX2-core emulation options, which are passed to the emu core prior to initiating - // an emulation session. Note these are the options saved into the GUI ini file and - // which are shown as options in the gui preferences, but *not* necessarily the options - // used by emulation. The gui allows temporary per-game and commandline level overrides. - Pcsx2Config EmuOptions; - -public: - AppConfig(); - std::string FullpathToSaveState(const std::string& serialName, const std::string& CRCvalue) const; - void LoadSave(IniInterface& ini, SettingsWrapper& wrap); - void LoadSaveRootItems(IniInterface& ini); - - static int GetMaxPresetIndex(); - static bool isOkGetPresetTextAndColor(int n, wxString& label, wxColor& c); - - bool IsOkApplyPreset(int n, bool ignoreMTVU); - - - //The next 2 flags are used with ApplyConfigToGui which the presets system use: - - //Indicates that the scope is only for preset-related items. - static const int APPLY_FLAG_FROM_PRESET = 0x01; - - //Indicates that the change should manually propagate to sub items because it's called directly and not as an event. - //Currently used by some panels which contain sub-panels which are affected by presets. - static const int APPLY_FLAG_MANUALLY_PROPAGATE = 0x02; - -}; - -extern void AppLoadSettings(); -extern void AppSaveSettings(); -extern void AppApplySettings( const AppConfig* oldconf=NULL ); -extern void AppSetEmuFolders(); - -extern void App_LoadSaveInstallSettings( IniInterface& ini ); -extern void App_SaveInstallSettings( wxConfigBase* ini ); -extern void App_LoadInstallSettings( wxConfigBase* ini ); - -extern void ConLog_LoadSaveSettings( IniInterface& ini ); -extern void SysTraceLog_LoadSaveSettings( IniInterface& ini ); - - -extern wxFileConfig* OpenFileConfig( const wxString& filename ); -extern void RelocateLogfile(); -extern void AppConfig_OnChangedSettingsFolder( bool overwrite = false ); -extern wxConfigBase* GetAppConfig(); - -extern std::unique_ptr g_Conf; - -extern bool isValidNewFilename(wxString filenameStringToTest, wxDirName atBasePath, wxString& out_errorMessage, uint minNumCharacters = 5); diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp deleted file mode 100644 index bccc33ad59..0000000000 --- a/pcsx2/gui/AppCoreThread.cpp +++ /dev/null @@ -1,809 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "AppSaveStates.h" -#include "GameDatabase.h" - -#include -#include -#include "fmt/core.h" - -#include "common/FileSystem.h" -#include "common/StringUtil.h" -#include "common/Threading.h" - -#include "Host.h" -#include "ps2/BiosTools.h" -#include "GS.h" - -#include "CDVD/CDVD.h" -#include "USB/USBNull.h" -#include "Elfheader.h" -#include "Patch.h" -#include "R5900Exceptions.h" -#include "Sio.h" - -#include "Recording/InputRecordingControls.h" - -alignas(16) SysMtgsThread mtgsThread; -alignas(16) AppCoreThread CoreThread; - -static std::vector s_widescreen_cheats_data; - -typedef void (AppCoreThread::*FnPtr_CoreThreadMethod)(); - -SysCoreThread& GetCoreThread() -{ - return CoreThread; -} - -SysMtgsThread& GetMTGS() -{ - return mtgsThread; -} - -namespace GameInfo -{ - wxString gameName; - wxString gameSerial; - wxString gameCRC; - wxString gameVersion; -}; // namespace GameInfo - -// -------------------------------------------------------------------------------------- -// SysExecEvent_InvokeCoreThreadMethod -// -------------------------------------------------------------------------------------- -class SysExecEvent_InvokeCoreThreadMethod : public SysExecEvent -{ -protected: - FnPtr_CoreThreadMethod m_method; - bool m_IsCritical; - -public: - wxString GetEventName() const { return L"CoreThreadMethod"; } - virtual ~SysExecEvent_InvokeCoreThreadMethod() = default; - SysExecEvent_InvokeCoreThreadMethod* Clone() const { return new SysExecEvent_InvokeCoreThreadMethod(*this); } - - bool AllowCancelOnExit() const { return false; } - bool IsCriticalEvent() const { return m_IsCritical; } - - SysExecEvent_InvokeCoreThreadMethod(FnPtr_CoreThreadMethod method, bool critical = false) - { - m_method = method; - m_IsCritical = critical; - } - - SysExecEvent_InvokeCoreThreadMethod& Critical() - { - m_IsCritical = true; - return *this; - } - -protected: - void InvokeEvent() - { - if (m_method) - (CoreThread.*m_method)(); - } -}; - -static void PostCoreStatus(CoreThreadStatus pevt) -{ - sApp.PostAction(CoreThreadStatusEvent(pevt)); -} - -// -------------------------------------------------------------------------------------- -// AppCoreThread Implementations -// -------------------------------------------------------------------------------------- -AppCoreThread::AppCoreThread() - : SysCoreThread() - , m_resetCdvd(false) -{ -} - -AppCoreThread::~AppCoreThread() -{ - try - { - _parent::Cancel(); // use parent's, skips thread affinity check. - } - DESTRUCTOR_CATCHALL -} - -static void _Cancel() -{ - GetCoreThread().Cancel(); -} - -void AppCoreThread::Cancel(bool isBlocking) -{ - if (GetSysExecutorThread().IsRunning() && !GetSysExecutorThread().Rpc_TryInvoke(_Cancel, L"AppCoreThread::Cancel")) - _parent::Cancel(wxTimeSpan(0, 0, 4, 0)); -} - -void AppCoreThread::Reset() -{ - if (!GetSysExecutorThread().IsSelf()) - { - GetSysExecutorThread().PostEvent(SysExecEvent_InvokeCoreThreadMethod(&AppCoreThread::Reset)); - return; - } - - _parent::Reset(); -} - -void AppCoreThread::ResetQuick() -{ - if (!GetSysExecutorThread().IsSelf()) - { - GetSysExecutorThread().PostEvent(SysExecEvent_InvokeCoreThreadMethod(&AppCoreThread::ResetQuick)); - return; - } - - _parent::ResetQuick(); -} - -ExecutorThread& GetSysExecutorThread() -{ - return wxGetApp().SysExecutorThread; -} - -static void _Suspend() -{ - GetCoreThread().Suspend(true); -} - -void AppCoreThread::Suspend(bool isBlocking) -{ - if (IsClosed()) - return; - - if (IsSelf()) - { - // this should never fail... - bool result = GetSysExecutorThread().Rpc_TryInvokeAsync(_Suspend, L"AppCoreThread::Suspend"); - pxAssert(result); - } - else if (!GetSysExecutorThread().Rpc_TryInvoke(_Suspend, L"AppCoreThread::Suspend")) - _parent::Suspend(true); -} - -void AppCoreThread::Resume() -{ - if (!GetSysExecutorThread().IsSelf()) - { - GetSysExecutorThread().PostEvent(SysExecEvent_InvokeCoreThreadMethod(&AppCoreThread::Resume)); - return; - } - _parent::Resume(); -} - -void AppCoreThread::ChangeCdvdSource() -{ - if (!GetSysExecutorThread().IsSelf()) - { - GetSysExecutorThread().PostEvent(new SysExecEvent_InvokeCoreThreadMethod(&AppCoreThread::ChangeCdvdSource)); - return; - } - - CDVD_SourceType cdvdsrc(g_Conf->CdvdSource); - if (cdvdsrc == CDVDsys_GetSourceType()) - return; - - // Fast change of the CDVD source only -- a Pause will suffice. - - ScopedCoreThreadPause paused_core; - CDVDsys_ChangeSource(cdvdsrc); - paused_core.AllowResume(); - - // TODO: Add a listener for CDVDsource changes? Or should we bother? -} - -void Pcsx2App::SysApplySettings() -{ - if (AppRpc_TryInvoke(&Pcsx2App::SysApplySettings)) - return; - CoreThread.ApplySettings(g_Conf->EmuOptions); - - const CDVD_SourceType cdvdsrc(g_Conf->CdvdSource); - const std::string currentIso(StringUtil::wxStringToUTF8String(g_Conf->CurrentIso)); - const std::string currentDisc(StringUtil::wxStringToUTF8String(g_Conf->Folders.RunDisc)); - if (cdvdsrc != CDVDsys_GetSourceType() || - CDVDsys_GetFile(CDVD_SourceType::Iso) != currentIso || - CDVDsys_GetFile(CDVD_SourceType::Disc) != currentDisc) - { - CoreThread.ResetCdvd(); - } - - CDVDsys_SetFile(CDVD_SourceType::Iso, currentIso); - CDVDsys_SetFile(CDVD_SourceType::Disc, currentDisc); -} - -void AppCoreThread::OnResumeReady() -{ - wxGetApp().SysApplySettings(); - wxGetApp().PostMethod(AppSaveSettings); - sApp.PostAppMethod(&Pcsx2App::leaveDebugMode); - _parent::OnResumeReady(); -} - -void AppCoreThread::OnPause() -{ - //sApp.PostAppMethod( &Pcsx2App::enterDebugMode ); - _parent::OnPause(); -} - -void AppCoreThread::OnPauseDebug() -{ - sApp.PostAppMethod(&Pcsx2App::enterDebugMode); - _parent::OnPause(); -} - -// Load Game Settings found in database -// (game fixes, round modes, clamp modes, etc...) -// Returns number of gamefixes set -static int loadGameSettings(Pcsx2Config& dest, const GameDatabaseSchema::GameEntry& game) -{ - int gf = 0; - - gf += game.applyGameFixes(dest, dest.EnablePatches); - gf += game.applyGSHardwareFixes(dest.GS); - - return gf; -} - -// Used to track the current game serial/id, and used to disable verbose logging of -// applied patches if the game info hasn't changed. (avoids spam when suspending/resuming -// or using TAB or other things), but gets verbose again when booting (even if the same game). -// File scope since it gets reset externally when rebooting -#define _UNKNOWN_GAME_KEY (L"_UNKNOWN_GAME_KEY") -static wxString curGameKey = _UNKNOWN_GAME_KEY; - -void PatchesVerboseReset() -{ - curGameKey = _UNKNOWN_GAME_KEY; -} - -// PatchesCon points to either Console or ConsoleWriter_Null, such that if we're in Devel mode -// or the user enabled the devel/verbose console it prints all patching info whenever it's applied, -// else it prints the patching info only once - right after boot. -const IConsoleWriter* PatchesCon = &Console; - -static void SetupPatchesCon(bool verbose) -{ -#ifdef PCSX2_DEVBUILD - PatchesCon = &Console; -#else - if (verbose || DevConWriterEnabled) - PatchesCon = &Console; - else - PatchesCon = &ConsoleWriter_Null; -#endif -} - -// fixup = src + command line overrides + game overrides (according to elfCRC). -// While at it, also [re]loads the relevant patches (but doesn't apply them), -// updates the console title, and, for good measures, does some (static) sio stuff. -// Oh, and updates curGameKey. I think that's it. -// It doesn't require that the emulation is paused, and console writes/title should -// be thread safe, but it's best if things don't move around much while it runs. -static Threading::Mutex mtx__ApplySettings; -static void _ApplySettings(const Pcsx2Config& src, Pcsx2Config& fixup) -{ - Threading::ScopedLock lock(mtx__ApplySettings); - // 'fixup' is the EmuConfig we're going to upload to the emulator, which very well may - // differ from the user-configured EmuConfig settings. So we make a copy here and then - // we apply the commandline overrides and database gamefixes, and then upload 'fixup' - // to the global EmuConfig. - // - // Note: It's important that we apply the commandline overrides *before* database fixes. - // The database takes precedence (if enabled). - - fixup.CopyConfig(src); - - const CommandlineOverrides& overrides(wxGetApp().Overrides); - if (overrides.DisableSpeedhacks || !g_Conf->EnableSpeedHacks) - fixup.Speedhacks.DisableAll(); - - if (overrides.ApplyCustomGamefixes) - { - for (GamefixId id = GamefixId_FIRST; id < pxEnumEnd; ++id) - fixup.Gamefixes.Set(id, overrides.Gamefixes.Get(id)); - } - else if (!g_Conf->EnableGameFixes) - fixup.Gamefixes.DisableAll(); - - if (overrides.ProfilingMode) - { - fixup.GS.FrameLimitEnable = false; - fixup.GS.VsyncEnable = VsyncMode::Off; - } - - // Remove any user-specified hacks in the config (we don't want stale/conflicting values when it's globally disabled). - fixup.GS.MaskUserHacks(); - fixup.GS.MaskUpscalingHacks(); - - wxString gamePatch; - wxString gameFixes; - wxString gameCheats; - wxString gameWsHacks; - - wxString gameCompat; - wxString gameMemCardFilter; - - // The CRC can be known before the game actually starts (at the bios), so when - // we have the CRC but we're still at the bios and the settings are changed - // (e.g. the user presses TAB to speed up emulation), we don't want to apply the - // settings as if the game is already running (title, loadeding patches, etc). - bool ingame = (ElfCRC && (g_GameLoading || g_GameStarted)); - if (ingame) - GameInfo::gameCRC.Printf(L"%8.8X", ElfCRC); - else - GameInfo::gameCRC = L""; // Needs to be reset when rebooting otherwise previously loaded patches may load - - if (ingame && !DiscSerial.empty()) - GameInfo::gameSerial = StringUtil::UTF8StringToWxString(DiscSerial); - - const wxString newGameKey(StringUtil::UTF8StringToWxString(ingame ? SysGetDiscID() : SysGetBiosDiscID())); - const bool verbose(newGameKey != curGameKey && ingame); - //Console.WriteLn(L"------> patches verbose: %d prev: '%s' new: '%s'", (int)verbose, WX_STR(curGameKey), WX_STR(newGameKey)); - SetupPatchesCon(verbose); - - curGameKey = newGameKey; - - ForgetLoadedPatches(); - - if (!curGameKey.IsEmpty()) - { - auto game = GameDatabase::findGame(std::string(curGameKey.ToUTF8())); - if (game) - { - GameInfo::gameName = StringUtil::UTF8StringToWxString(StringUtil::StdStringFromFormat("%s (%s)", game->name.c_str(), game->region.c_str())); - gameCompat.Printf(" [Status = %s]", game->compatAsString()); - gameMemCardFilter = StringUtil::UTF8StringToWxString(game->memcardFiltersAsString()); - - if (fixup.EnablePatches) - { - const std::string* patches = ingame ? game->findPatch(ElfCRC) : 0; - int numPatches; - if (patches && (numPatches = LoadPatchesFromString(*patches)) > 0) - { - gamePatch.Printf(L" [%d Patches]", numPatches); - PatchesCon->WriteLn(Color_Green, "(GameDB) Patches Loaded: %d", numPatches); - } - } - if (int fixes = loadGameSettings(fixup, *game)) - gameFixes.Printf(L" [%d Fixes]", fixes); - } - else - { - // Set correct title for loading standalone/homebrew ELFs - GameInfo::gameName = StringUtil::UTF8StringToWxString(LastELF).AfterLast('\\'); - } - } - - if (!gameMemCardFilter.IsEmpty()) - sioSetGameSerial(StringUtil::wxStringToUTF8String(gameMemCardFilter)); - else - sioSetGameSerial(StringUtil::wxStringToUTF8String(curGameKey)); - - if (GameInfo::gameName.IsEmpty() && GameInfo::gameSerial.IsEmpty() && GameInfo::gameCRC.IsEmpty()) - { - // if all these conditions are met, it should mean that we're currently running BIOS code. - // Chances are the BiosChecksum value is still zero or out of date, however -- because - // the BIos isn't loaded until after initial calls to ApplySettings. - - GameInfo::gameName = L"Booting PS2 BIOS... "; - } - - //Till the end of this function, entry CRC will be 00000000 - if (!GameInfo::gameCRC.Length()) - { - Console.WriteLn(Color_Gray, "Patches: No CRC found, using 00000000 instead."); - GameInfo::gameCRC = L"00000000"; - } - - // regular cheat patches - if (fixup.EnableCheats) - gameCheats.Printf(L" [%d Cheats]", LoadPatchesFromDir(StringUtil::wxStringToUTF8String(GameInfo::gameCRC), EmuFolders::Cheats, "Cheats", true)); - - // wide screen patches - if (fixup.EnableWideScreenPatches) - { - if (int numberLoadedWideScreenPatches = LoadPatchesFromDir(StringUtil::wxStringToUTF8String(GameInfo::gameCRC), EmuFolders::CheatsWS, "Widescreen hacks", false)) - { - gameWsHacks.Printf(L" [%d widescreen hacks]", numberLoadedWideScreenPatches); - Console.WriteLn(Color_Gray, "Found widescreen patches in the cheats_ws folder --> skipping cheats_ws.zip"); - } - else - { - // No ws cheat files found at the cheats_ws folder, try the ws cheats zip file. - std::optional> data = Host::ReadResourceFile("cheats_ws.zip"); - if (data.has_value()) - s_widescreen_cheats_data = std::move(data.value()); - - if (!s_widescreen_cheats_data.empty()) - { - int numberDbfCheatsLoaded = LoadPatchesFromZip(StringUtil::wxStringToUTF8String(GameInfo::gameCRC), s_widescreen_cheats_data.data(), s_widescreen_cheats_data.size()); - PatchesCon->WriteLn(Color_Green, "(Wide Screen Cheats DB) Patches Loaded: %d", numberDbfCheatsLoaded); - gameWsHacks.Printf(L" [%d widescreen hacks]", numberDbfCheatsLoaded); - } - } - } - - // When we're booting, the bios loader will set a a title which would be more interesting than this - // to most users - with region, version, etc, so don't overwrite it with patch info. That's OK. Those - // users which want to know the status of the patches at the bios can check the console content. - wxString consoleTitle = GameInfo::gameName + L" [" + GameInfo::gameSerial + L"]"; - consoleTitle += L" [" + GameInfo::gameCRC + L"]" + gameCompat + gameFixes + gamePatch + gameCheats + gameWsHacks; - if (ingame) - Console.SetTitle(consoleTitle.ToUTF8()); - - gsUpdateFrequency(fixup); -} - -// FIXME: This function is not for general consumption. Its only consumer (and -// the only place it's declared at) is i5900-32.cpp . -// It's here specifically to allow loading the patches synchronously (to the caller) -// when the recompiler detects the game's elf entry point, such that the patches -// are applied to the elf in memory before it's getting recompiled. -// TODO: Find a way to pause the recompiler once it detects the elf entry, then -// make AppCoreThread::ApplySettings run more normally, and then resume -// the recompiler. -// The key point is that the patches should be loaded exactly before the elf -// is recompiled. Loading them earlier might incorrectly patch the bios memory, -// and later might be too late since the code was already recompiled -void LoadAllPatchesAndStuff(const Pcsx2Config& cfg) -{ - Pcsx2Config dummy; - PatchesVerboseReset(); - _ApplySettings(cfg, dummy); - - // And I'm hacking in updating the UI here too. -#ifdef USE_SAVESLOT_UI_UPDATES - UI_UpdateSysControls(); -#endif -} - -void AppCoreThread::ApplySettings(const Pcsx2Config& src) -{ - // Re-entry guard protects against cases where code wants to manually set core settings - // which are not part of g_Conf. The subsequent call to apply g_Conf settings (which is - // usually the desired behavior) will be ignored. - Pcsx2Config fixup; - _ApplySettings(src, fixup); - - static int localc = 0; - RecursionGuard guard(localc); - if (guard.IsReentrant()) - return; - if (fixup == EmuConfig) - return; - - if (m_ExecMode >= ExecMode_Opened && !IsSelf()) - { - ScopedCoreThreadPause paused_core; - _parent::ApplySettings(fixup); - paused_core.AllowResume(); - } - else - { - _parent::ApplySettings(fixup); - } -} - -// -------------------------------------------------------------------------------------- -// AppCoreThread *Worker* Implementations -// (Called from the context of this thread only) -// -------------------------------------------------------------------------------------- - -void AppCoreThread::DoCpuReset() -{ - PostCoreStatus(CoreThread_Reset); - _parent::DoCpuReset(); -} - -void AppCoreThread::OnResumeInThread(SystemsMask systemsToReinstate) -{ - if (m_resetCdvd) - { - CDVDsys_ChangeSource(g_Conf->CdvdSource); - DoCDVDopen(); - cdvdCtrlTrayOpen(); - m_resetCdvd = false; - } - else if (systemsToReinstate & System_CDVD) - DoCDVDopen(); - - _parent::OnResumeInThread(systemsToReinstate); - PostCoreStatus(CoreThread_Resumed); -} - -void AppCoreThread::OnSuspendInThread() -{ - _parent::OnSuspendInThread(); - PostCoreStatus(CoreThread_Suspended); -} - -// Called whenever the thread has terminated, for either regular or irregular reasons. -// Typically the thread handles all its own errors, so there's no need to have error -// handling here. However it's a good idea to update the status of the GUI to reflect -// the new (lack of) thread status, so this posts a message to the App to do so. -void AppCoreThread::OnCleanupInThread() -{ - m_ExecMode = ExecMode_Closing; - PostCoreStatus(CoreThread_Stopped); - _parent::OnCleanupInThread(); -} - -void AppCoreThread::VsyncInThread() -{ - wxGetApp().LogicalVsync(); - _parent::VsyncInThread(); -} - -void AppCoreThread::GameStartingInThread() -{ - // Simulate a Close/Resume, so that settings get re-applied and the database - // lookups and other game-based detections are done. - - m_ExecMode = ExecMode_Paused; - OnResumeReady(); - _reset_stuff_as_needed(); - AutoEject::ClearAll(); // probably safe to do this when a game boots, eliminates annoying prompts - m_ExecMode = ExecMode_Opened; - - _parent::GameStartingInThread(); -} - -bool AppCoreThread::StateCheckInThread() -{ - return _parent::StateCheckInThread(); -} - -static uint m_except_threshold = 0; - -void AppCoreThread::ExecuteTaskInThread() -{ - PostCoreStatus(CoreThread_Started); - m_except_threshold = 0; - _parent::ExecuteTaskInThread(); -} - -void AppCoreThread::DoCpuExecute() -{ - try - { - _parent::DoCpuExecute(); - } - catch (BaseR5900Exception& ex) - { - Console.Error(ex.FormatMessage()); - - // [TODO] : Debugger Hook! - - if (++m_except_threshold > 6) - { - // If too many TLB Misses occur, we're probably going to crash and - // the game is probably running miserably. - - m_except_threshold = 0; - //Suspend(); - - // [TODO] Issue error dialog to the user here... - Console.Error("Too many execution errors. VM execution has been suspended!"); - - // Hack: this keeps the EE thread from running more code while the SysExecutor - // thread catches up and signals it for suspension. - m_ExecMode = ExecMode_Closing; - } - } -} - -// -------------------------------------------------------------------------------------- -// BaseSysExecEvent_ScopedCore / SysExecEvent_CoreThreadClose / SysExecEvent_CoreThreadPause -// -------------------------------------------------------------------------------------- -void BaseSysExecEvent_ScopedCore::_post_and_wait(IScopedCoreThread& core) -{ - DoScopedTask(); - - ScopedLock lock(m_mtx_resume); - PostResult(); - - if (m_resume) - { - // If the sender of the message requests a non-blocking resume, then we need - // to deallocate the m_sync object, since the sender will likely leave scope and - // invalidate it. - switch (m_resume->WaitForResult()) - { - case ScopedCore_BlockingResume: - if (m_sync) - m_sync->ClearResult(); - core.AllowResume(); - break; - - case ScopedCore_NonblockingResume: - m_sync = NULL; - core.AllowResume(); - break; - - case ScopedCore_SkipResume: - m_sync = NULL; - break; - } - } -} - - -void SysExecEvent_CoreThreadClose::InvokeEvent() -{ - ScopedCoreThreadClose closed_core; - _post_and_wait(closed_core); - closed_core.AllowResume(); -} - - -void SysExecEvent_CoreThreadPause::InvokeEvent() -{ - ScopedCoreThreadPause paused_core(m_systemsToTearDown); - _post_and_wait(paused_core); - paused_core.AllowResume(); -} - - -// -------------------------------------------------------------------------------------- -// ScopedCoreThreadClose / ScopedCoreThreadPause -// -------------------------------------------------------------------------------------- - -static thread_local bool ScopedCore_IsPaused = false; -static thread_local bool ScopedCore_IsFullyClosed = false; - -BaseScopedCoreThread::BaseScopedCoreThread() -{ - //AffinityAssert_AllowFrom_MainUI(); - - m_allowResume = false; - m_alreadyStopped = false; - m_alreadyScoped = false; -} - -BaseScopedCoreThread::~BaseScopedCoreThread() = default; - -// Allows the object to resume execution upon object destruction. Typically called as the last thing -// in the object's scope. Any code prior to this call that causes exceptions will not resume the emulator, -// which is *typically* the intended behavior when errors occur. -void BaseScopedCoreThread::AllowResume() -{ - m_allowResume = true; -} - -void BaseScopedCoreThread::DisallowResume() -{ - m_allowResume = false; -} - -void BaseScopedCoreThread::DoResume() -{ - if (m_alreadyStopped) - return; - if (!GetSysExecutorThread().IsSelf()) - { - //DbgCon.WriteLn("(ScopedCoreThreadPause) Threaded Scope Created!"); - m_sync_resume.PostResult(m_allowResume ? ScopedCore_NonblockingResume : ScopedCore_SkipResume); - m_mtx_resume.Wait(); - } - else - CoreThread.Resume(); -} - -// Returns TRUE if the event is posted to the SysExecutor. -// Returns FALSE if the thread *is* the SysExecutor (no message is posted, calling code should -// handle the code directly). -bool BaseScopedCoreThread::PostToSysExec(std::unique_ptr msg) -{ - if (!msg || GetSysExecutorThread().IsSelf()) - return false; - - msg->SetSyncState(m_sync); - msg->SetResumeStates(m_sync_resume, m_mtx_resume); - - GetSysExecutorThread().PostEvent(msg.release()); - m_sync.WaitForResult(); - m_sync.RethrowException(); - - return true; -} - -ScopedCoreThreadClose::ScopedCoreThreadClose() -{ - if (ScopedCore_IsFullyClosed) - { - // tracks if we're already in scope or not. - m_alreadyScoped = true; - return; - } - - if (!PostToSysExec(std::make_unique())) - { - m_alreadyStopped = CoreThread.IsClosed(); - if (!m_alreadyStopped) - CoreThread.Suspend(); - } - - ScopedCore_IsFullyClosed = true; -} - -ScopedCoreThreadClose::~ScopedCoreThreadClose() -{ - if (m_alreadyScoped) - return; - try - { - _parent::DoResume(); - ScopedCore_IsFullyClosed = false; - } - DESTRUCTOR_CATCHALL -} - -ScopedCoreThreadPause::ScopedCoreThreadPause(SystemsMask systemsToTearDown) -{ - if (ScopedCore_IsFullyClosed || ScopedCore_IsPaused) - { - // tracks if we're already in scope or not. - m_alreadyScoped = true; - return; - } - - if (!PostToSysExec(std::make_unique(systemsToTearDown))) - { - m_alreadyStopped = CoreThread.IsPaused(); - if (!m_alreadyStopped) - CoreThread.Pause(systemsToTearDown); - } - - ScopedCore_IsPaused = true; -} - -ScopedCoreThreadPause::~ScopedCoreThreadPause() -{ - if (m_alreadyScoped) - return; - try - { - _parent::DoResume(); - ScopedCore_IsPaused = false; - } - DESTRUCTOR_CATCHALL -} - -ScopedCoreThreadPopup::ScopedCoreThreadPopup() - : m_scoped_core(std::unique_ptr(new ScopedCoreThreadPause())) -{ -}; - -void ScopedCoreThreadPopup::AllowResume() -{ - if (m_scoped_core) - m_scoped_core->AllowResume(); -} - -void ScopedCoreThreadPopup::DisallowResume() -{ - if (m_scoped_core) - m_scoped_core->DisallowResume(); -} diff --git a/pcsx2/gui/AppCoreThread.h b/pcsx2/gui/AppCoreThread.h deleted file mode 100644 index b7fe1dac15..0000000000 --- a/pcsx2/gui/AppCoreThread.h +++ /dev/null @@ -1,264 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "SysThreads.h" -#include "pxEventThread.h" - -#include "AppCommon.h" -#include "SaveState.h" - -#include - -#define AffinityAssert_AllowFrom_CoreThread() \ - pxAssertMsg(GetCoreThread().IsSelf(), "Thread affinity violation: Call allowed from SysCoreThread only.") - -#define AffinityAssert_DisallowFrom_CoreThread() \ - pxAssertMsg(!GetCoreThread().IsSelf(), "Thread affinity violation: Call is *not* allowed from SysCoreThread.") - -class IScopedCoreThread; -class BaseScopedCoreThread; - -enum ScopedCoreResumeType -{ - ScopedCore_BlockingResume, - ScopedCore_NonblockingResume, - ScopedCore_SkipResume -}; - -namespace GameInfo -{ - extern wxString gameName; - extern wxString gameSerial; - extern wxString gameCRC; - extern wxString gameVersion; -}; // namespace GameInfo - - -// -------------------------------------------------------------------------------------- -// BaseSysExecEvent_ScopedCore -// -------------------------------------------------------------------------------------- -class BaseSysExecEvent_ScopedCore : public SysExecEvent -{ -protected: - SynchronousActionState* m_resume; - Threading::Mutex* m_mtx_resume; - -public: - virtual ~BaseSysExecEvent_ScopedCore() = default; - - BaseSysExecEvent_ScopedCore& SetResumeStates(SynchronousActionState* sync, Threading::Mutex* mutex) - { - m_resume = sync; - m_mtx_resume = mutex; - return *this; - } - - BaseSysExecEvent_ScopedCore& SetResumeStates(SynchronousActionState& sync, Threading::Mutex& mutex) - { - m_resume = &sync; - m_mtx_resume = &mutex; - return *this; - } - -protected: - BaseSysExecEvent_ScopedCore(SynchronousActionState* sync = NULL, SynchronousActionState* resume_sync = NULL, Threading::Mutex* mtx_resume = NULL) - : SysExecEvent(sync) - { - m_resume = resume_sync; - m_mtx_resume = mtx_resume; - } - - void _post_and_wait(IScopedCoreThread& core); - - virtual void DoScopedTask() {} -}; - - -// -------------------------------------------------------------------------------------- -// SysExecEvent_CoreThreadClose -// -------------------------------------------------------------------------------------- -class SysExecEvent_CoreThreadClose : public BaseSysExecEvent_ScopedCore -{ -public: - wxString GetEventName() const { return L"CloseCoreThread"; } - - virtual ~SysExecEvent_CoreThreadClose() = default; - SysExecEvent_CoreThreadClose* Clone() const { return new SysExecEvent_CoreThreadClose(*this); } - - SysExecEvent_CoreThreadClose(SynchronousActionState* sync = NULL, SynchronousActionState* resume_sync = NULL, Threading::Mutex* mtx_resume = NULL) - : BaseSysExecEvent_ScopedCore(sync, resume_sync, mtx_resume) - { - } - -protected: - void InvokeEvent(); -}; - -// -------------------------------------------------------------------------------------- -// SysExecEvent_CoreThreadPause -// -------------------------------------------------------------------------------------- -class SysExecEvent_CoreThreadPause : public BaseSysExecEvent_ScopedCore -{ -public: - wxString GetEventName() const { return L"PauseCoreThread"; } - - virtual ~SysExecEvent_CoreThreadPause() = default; - SysExecEvent_CoreThreadPause* Clone() const { return new SysExecEvent_CoreThreadPause(*this); } - - SysExecEvent_CoreThreadPause(SystemsMask systemsToTearDown, SynchronousActionState* sync = NULL, SynchronousActionState* resume_sync = NULL, Threading::Mutex* mtx_resume = NULL) - : BaseSysExecEvent_ScopedCore(sync, resume_sync, mtx_resume) - , m_systemsToTearDown(systemsToTearDown) - { - } - -protected: - void InvokeEvent(); - -private: - SystemsMask m_systemsToTearDown; -}; - -// -------------------------------------------------------------------------------------- -// AppCoreThread class -// -------------------------------------------------------------------------------------- -class AppCoreThread : public SysCoreThread -{ - typedef SysCoreThread _parent; - -protected: - std::atomic m_resetCdvd; - -public: - AppCoreThread(); - virtual ~AppCoreThread(); - - void ResetCdvd() { m_resetCdvd = true; } - - virtual void Suspend(bool isBlocking = false) override; - virtual void Resume() override; - virtual void Reset() override; - virtual void ResetQuick() override; - virtual void Cancel(bool isBlocking = true) override; - virtual bool StateCheckInThread() override; - virtual void ChangeCdvdSource(); - - virtual void ApplySettings(const Pcsx2Config& src) override; - -protected: - virtual void DoCpuExecute() override; - - virtual void OnResumeReady() override; - virtual void OnPause() override; - virtual void OnPauseDebug() override; - virtual void OnResumeInThread(SystemsMask systemsToReinstate) override; - virtual void OnSuspendInThread() override; - virtual void OnCleanupInThread() override; - virtual void VsyncInThread() override; - virtual void GameStartingInThread() override; - virtual void ExecuteTaskInThread() override; - virtual void DoCpuReset() override; -}; - -// -------------------------------------------------------------------------------------- -// IScopedCoreThread / BaseScopedCoreThread -// -------------------------------------------------------------------------------------- -class IScopedCoreThread -{ -protected: - IScopedCoreThread() {} - -public: - virtual ~IScopedCoreThread() = default; - ; - virtual void AllowResume() = 0; - virtual void DisallowResume() = 0; -}; - -class BaseScopedCoreThread : public IScopedCoreThread -{ - DeclareNoncopyableObject(BaseScopedCoreThread); - -protected: - bool m_allowResume; - bool m_alreadyStopped; - bool m_alreadyScoped; - SynchronousActionState m_sync; - SynchronousActionState m_sync_resume; - Threading::Mutex m_mtx_resume; - - BaseScopedCoreThread(); - -public: - virtual ~BaseScopedCoreThread() = 0; - virtual void AllowResume(); - virtual void DisallowResume(); - - virtual bool PostToSysExec(std::unique_ptr msg); - -protected: - // Called from destructors -- do not make virtual!! - void DoResume(); -}; - -// -------------------------------------------------------------------------------------- -// ScopedCoreThreadClose / ScopedCoreThreadPause / ScopedCoreThreadPopup -// -------------------------------------------------------------------------------------- -// This class behaves a bit differently from other scoped classes due to the "standard" -// assumption that we actually do *not* want to resume CoreThread operations when an -// exception occurs. Because of this, the destructor of this class does *not* unroll the -// suspend operation. Instead you must manually instruct the class to resume using a call -// to the provisioned AllowResume() method. -// -// If the class leaves scope without having been resumed, a log is written to the console. -// This can be useful for troubleshooting, and also allows the log a second line of info -// indicating the status of CoreThread execution at the time of the exception. -// -// ScopedCoreThreadPopup is intended for use where message boxes are popped up to the user. -// The old style GUI (without GSopen2) must use a full close of the CoreThread, in order to -// ensure that the GS window isn't blocking the popup, and to avoid crashes if the GS window -// is maximized or fullscreen. -// -class ScopedCoreThreadClose : public BaseScopedCoreThread -{ - typedef BaseScopedCoreThread _parent; - -public: - ScopedCoreThreadClose(); - virtual ~ScopedCoreThreadClose(); -}; - -struct ScopedCoreThreadPause : public BaseScopedCoreThread -{ - typedef BaseScopedCoreThread _parent; - -public: - ScopedCoreThreadPause(SystemsMask systemsToTearDown = {}); - virtual ~ScopedCoreThreadPause(); -}; - -struct ScopedCoreThreadPopup : public IScopedCoreThread -{ -protected: - std::unique_ptr m_scoped_core; - -public: - ScopedCoreThreadPopup(); - virtual ~ScopedCoreThreadPopup() = default; - - virtual void AllowResume(); - virtual void DisallowResume(); -}; diff --git a/pcsx2/gui/AppEventListeners.h b/pcsx2/gui/AppEventListeners.h deleted file mode 100644 index 79bc53f326..0000000000 --- a/pcsx2/gui/AppEventListeners.h +++ /dev/null @@ -1,211 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "common/EventSource.h" -#include "gui/IniInterface.h" -#include "gui/pxEvents.h" - -enum CoreThreadStatus -{ - CoreThread_Indeterminate, - CoreThread_Started, - CoreThread_Resumed, - CoreThread_Suspended, - CoreThread_Reset, - CoreThread_Stopped, -}; - -enum AppEventType -{ - AppStatus_UiSettingsLoaded, - AppStatus_UiSettingsSaved, - AppStatus_VmSettingsLoaded, - AppStatus_VmSettingsSaved, - - AppStatus_SettingsApplied, - AppStatus_Exiting -}; - -struct AppEventInfo -{ - AppEventType evt_type; - - AppEventInfo( AppEventType type ) - { - evt_type = type; - } -}; - -struct AppSettingsEventInfo : AppEventInfo -{ - IniInterface& m_ini; - - AppSettingsEventInfo( IniInterface& ini, AppEventType evt_type ); - - IniInterface& GetIni() const - { - return const_cast(m_ini); - } -}; - -// -------------------------------------------------------------------------------------- -// IEventListener_CoreThread -// -------------------------------------------------------------------------------------- -class IEventListener_CoreThread : public IEventDispatcher -{ -public: - typedef CoreThreadStatus EvtParams; - -public: - virtual ~IEventListener_CoreThread() = default; - - virtual void DispatchEvent( const CoreThreadStatus& status ); - -protected: - virtual void CoreThread_OnStarted() {} - virtual void CoreThread_OnResumed() {} - virtual void CoreThread_OnSuspended() {} - virtual void CoreThread_OnReset() {} - virtual void CoreThread_OnStopped() {} -}; - -class EventListener_CoreThread : public IEventListener_CoreThread -{ -public: - EventListener_CoreThread(); - virtual ~EventListener_CoreThread(); -}; - -// -------------------------------------------------------------------------------------- -// IEventListener_AppStatus -// -------------------------------------------------------------------------------------- -class IEventListener_AppStatus : public IEventDispatcher -{ -public: - typedef AppEventInfo EvtParams; - -public: - virtual ~IEventListener_AppStatus() = default; - - virtual void DispatchEvent( const AppEventInfo& evtinfo ); - -protected: - virtual void AppStatusEvent_OnUiSettingsLoadSave( const AppSettingsEventInfo& evtinfo ) {} - virtual void AppStatusEvent_OnVmSettingsLoadSave( const AppSettingsEventInfo& evtinfo ) {} - - virtual void AppStatusEvent_OnSettingsApplied() {} - virtual void AppStatusEvent_OnExit() {} -}; - -class EventListener_AppStatus : public IEventListener_AppStatus -{ -public: - EventListener_AppStatus(); - virtual ~EventListener_AppStatus(); -}; - -// -------------------------------------------------------------------------------------- -// EventListenerHelpers (CoreThread / AppStatus) -// -------------------------------------------------------------------------------------- -// Welcome to the awkward world of C++ multi-inheritence. wxWidgets' Connect() system is -// incompatible because of limitations in C++ class member function pointers, so we need -// this second layer class to act as a bridge between the event system and the class's -// handler implementations. -// -// Explained in detail: The class that wants to listen to shit will implement its expected -// virtual overrides from the listener classes (OnCoreThread_Started, for example), and then -// it adds an instance of the EventListenerHelper_CoreThread class to itself, instead of -// *inheriting* from it. Thusly, the Helper gets initialized when the class is created, -// and when events are dispatched to the listener, it forwards the event to the main class. -// --air - -template< typename TypeToDispatchTo > -class EventListenerHelper_CoreThread : public EventListener_CoreThread -{ -public: - TypeToDispatchTo& Owner; - -public: - EventListenerHelper_CoreThread( TypeToDispatchTo& dispatchTo ) - : Owner( dispatchTo ) { } - - EventListenerHelper_CoreThread( TypeToDispatchTo* dispatchTo ) - : Owner( *dispatchTo ) - { - pxAssert(dispatchTo != NULL); - } - - virtual ~EventListenerHelper_CoreThread() = default; - -protected: - void CoreThread_OnIndeterminate() { Owner.OnCoreThread_Indeterminate(); } - void CoreThread_OnStarted() { Owner.OnCoreThread_Started(); } - void CoreThread_OnResumed() { Owner.OnCoreThread_Resumed(); } - void CoreThread_OnSuspended() { Owner.OnCoreThread_Suspended(); } - void CoreThread_OnReset() { Owner.OnCoreThread_Reset(); } - void CoreThread_OnStopped() { Owner.OnCoreThread_Stopped(); } -}; - -template< typename TypeToDispatchTo > -class EventListenerHelper_AppStatus : public EventListener_AppStatus -{ -public: - TypeToDispatchTo& Owner; - -public: - EventListenerHelper_AppStatus( TypeToDispatchTo& dispatchTo ) - : Owner( dispatchTo ) { } - - EventListenerHelper_AppStatus( TypeToDispatchTo* dispatchTo ) - : Owner( *dispatchTo ) - { - pxAssert(dispatchTo != NULL); - } - - virtual ~EventListenerHelper_AppStatus() = default; - -protected: - virtual void AppStatusEvent_OnUiSettingsLoadSave( const AppSettingsEventInfo& evtinfo ) { Owner.AppStatusEvent_OnUiSettingsLoadSave( evtinfo ); } - virtual void AppStatusEvent_OnVmSettingsLoadSave( const AppSettingsEventInfo& evtinfo ) { Owner.AppStatusEvent_OnVmSettingsLoadSave( evtinfo ); } - virtual void AppStatusEvent_OnSettingsApplied() { Owner.AppStatusEvent_OnSettingsApplied(); } - virtual void AppStatusEvent_OnExit() { Owner.AppStatusEvent_OnExit(); } -}; - - -// -------------------------------------------------------------------------------------- -// CoreThreadStatusEvent -// -------------------------------------------------------------------------------------- -class CoreThreadStatusEvent : public pxActionEvent -{ - typedef pxActionEvent _parent; - -protected: - CoreThreadStatus m_evt; - -public: - virtual ~CoreThreadStatusEvent() = default; - CoreThreadStatusEvent* Clone() const { return new CoreThreadStatusEvent( *this ); } - - explicit CoreThreadStatusEvent( CoreThreadStatus evt, SynchronousActionState* sema=NULL ); - explicit CoreThreadStatusEvent( CoreThreadStatus evt, SynchronousActionState& sema ); - - void SetEventType( CoreThreadStatus evt ) { m_evt = evt; } - CoreThreadStatus GetEventType() { return m_evt; } - -protected: - void InvokeEvent(); -}; diff --git a/pcsx2/gui/AppEventSources.cpp b/pcsx2/gui/AppEventSources.cpp deleted file mode 100644 index c1195e7084..0000000000 --- a/pcsx2/gui/AppEventSources.cpp +++ /dev/null @@ -1,141 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "IniInterface.h" -#include "common/EventSource.inl" - -template class EventSource< IEventListener_CoreThread >; -template class EventSource< IEventListener_AppStatus >; - -AppSettingsEventInfo::AppSettingsEventInfo( IniInterface& ini, AppEventType evt_type ) - : AppEventInfo( evt_type ) - , m_ini( ini ) -{ -} - -EventListener_CoreThread::EventListener_CoreThread() -{ - wxGetApp().AddListener( this ); -} - -EventListener_CoreThread::~EventListener_CoreThread() -{ - wxGetApp().RemoveListener( this ); -} - -void IEventListener_CoreThread::DispatchEvent( const CoreThreadStatus& status ) -{ - switch( status ) - { - case CoreThread_Indeterminate: break; - - case CoreThread_Started: CoreThread_OnStarted(); break; - case CoreThread_Resumed: CoreThread_OnResumed(); break; - case CoreThread_Suspended: CoreThread_OnSuspended(); break; - case CoreThread_Reset: CoreThread_OnReset(); break; - case CoreThread_Stopped: CoreThread_OnStopped(); break; - - jNO_DEFAULT; - } -} - -EventListener_AppStatus::EventListener_AppStatus() -{ - wxGetApp().AddListener( this ); -} - -EventListener_AppStatus::~EventListener_AppStatus() -{ - wxGetApp().RemoveListener( this ); -} - -void IEventListener_AppStatus::DispatchEvent( const AppEventInfo& evtinfo ) -{ - switch( evtinfo.evt_type ) - { - case AppStatus_UiSettingsLoaded: - case AppStatus_UiSettingsSaved: - AppStatusEvent_OnUiSettingsLoadSave( (const AppSettingsEventInfo&)evtinfo ); - break; - - case AppStatus_VmSettingsLoaded: - case AppStatus_VmSettingsSaved: - AppStatusEvent_OnVmSettingsLoadSave( (const AppSettingsEventInfo&)evtinfo ); - break; - - case AppStatus_SettingsApplied: - AppStatusEvent_OnSettingsApplied(); - break; - - case AppStatus_Exiting: - AppStatusEvent_OnExit(); - break; - } -} - -void Pcsx2App::DispatchEvent( AppEventType evt ) -{ - if( !AffinityAssert_AllowFrom_MainUI() ) return; - m_evtsrc_AppStatus.Dispatch( AppEventInfo( evt ) ); -} - -void Pcsx2App::DispatchEvent( CoreThreadStatus evt ) -{ - // Clear the sticky key statuses, because hell knows what'll change while PAD - // is suspended. - - m_kevt.m_shiftDown = false; - m_kevt.m_controlDown = false; - m_kevt.m_altDown = false; - - m_evtsrc_CoreThreadStatus.Dispatch( evt ); - ScopedBusyCursor::SetDefault( Cursor_NotBusy ); - CoreThread.RethrowException(); -} - -void Pcsx2App::DispatchUiSettingsEvent( IniInterface& ini ) -{ - if( !AffinityAssert_AllowFrom_MainUI() ) return; - m_evtsrc_AppStatus.Dispatch( AppSettingsEventInfo( ini, ini.IsSaving() ? AppStatus_UiSettingsSaved : AppStatus_UiSettingsLoaded ) ); -} - -void Pcsx2App::DispatchVmSettingsEvent( IniInterface& ini ) -{ - if( !AffinityAssert_AllowFrom_MainUI() ) return; - m_evtsrc_AppStatus.Dispatch( AppSettingsEventInfo( ini, ini.IsSaving() ? AppStatus_VmSettingsSaved : AppStatus_VmSettingsLoaded ) ); -} - - -// -------------------------------------------------------------------------------------- -// CoreThreadStatusEvent Implementations -// -------------------------------------------------------------------------------------- -CoreThreadStatusEvent::CoreThreadStatusEvent( CoreThreadStatus evt, SynchronousActionState* sema ) - : pxActionEvent( sema ) -{ - m_evt = evt; -} - -CoreThreadStatusEvent::CoreThreadStatusEvent( CoreThreadStatus evt, SynchronousActionState& sema ) - : pxActionEvent( sema ) -{ - m_evt = evt; -} - -void CoreThreadStatusEvent::InvokeEvent() -{ - sApp.DispatchEvent( m_evt ); -} diff --git a/pcsx2/gui/AppForwardDefs.h b/pcsx2/gui/AppForwardDefs.h deleted file mode 100644 index 4b93e06a5a..0000000000 --- a/pcsx2/gui/AppForwardDefs.h +++ /dev/null @@ -1,61 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -// AppForwardDefs.h -// -// Purpose: -// This header file is meant to be a dependency-free include that provides a relatively -// full compliment of forward defines for PCSX2/App and wxwidgets types. When -// forward defined in this way, these types can be used by method and class definitions -// as either pointers or handles without running into complicated header file -// inter-dependence. -// - -class Pcsx2App; -class MainEmuFrame; -class GSFrame; -class ConsoleLogFrame; -class PipeRedirectionBase; -class AppCoreThread; -class Pcsx2AppMethodEvent; -class pxAppResources; -class IScopedCoreThread; - -struct KeyAcceleratorCode; -struct GlobalCommandDescriptor; -class CommandDictionary; -class AcceleratorDictionary; - -class IniInterface; - -// wxWidgets forward declarations - -class wxConfigBase; -class wxFileConfig; -class wxDirPickerCtrl; -class wxFilePickerCtrl; -class wxFileDirPickerEvent; -class wxListBox; -class wxListCtrl; -class wxListView; -class wxListbook; -class wxSpinCtrl; -class wxBookCtrlBase; - -class wxListEvent; -class wxImageList; -class wxBitmap; diff --git a/pcsx2/gui/AppHost.cpp b/pcsx2/gui/AppHost.cpp deleted file mode 100644 index f82f0f4522..0000000000 --- a/pcsx2/gui/AppHost.cpp +++ /dev/null @@ -1,226 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "common/Console.h" -#include "common/FileSystem.h" -#include "common/Path.h" -#include "common/StringUtil.h" - -#include "Host.h" -#include "HostSettings.h" -#include "HostDisplay.h" -#include "GS/GS.h" - -#include "common/Assertions.h" -#include "Frontend/ImGuiManager.h" - -#include "gui/App.h" -#include "gui/AppHost.h" -#include "gui/pxEvents.h" - -#include -#include - -#include "gui/App.h" -#include "gui/AppConfig.h" -#include "gui/pxEvents.h" - -static auto OpenResourceCFile(const char* filename, const char* mode) -{ - const std::string full_filename(Path::Combine(EmuFolders::Resources, filename)); - auto fp = FileSystem::OpenManagedCFile(full_filename.c_str(), mode); - if (!fp) - Console.Error("Failed to open resource file '%s'", filename); - - return fp; -} - -std::optional> Host::ReadResourceFile(const char* filename) -{ - auto fp = OpenResourceCFile(filename, "rb"); - if (!fp) - return std::nullopt; - - const size_t size = FileSystem::FSize64(fp.get()); - std::vector ret(size); - if (std::fread(ret.data(), size, 1, fp.get()) != 1) - { - Console.Error("Failed to read resource file '%s'", filename); - return std::nullopt; - } - - return ret; -} - -std::optional Host::ReadResourceFileToString(const char* filename) -{ - auto fp = OpenResourceCFile(filename, "rb"); - if (!fp) - return std::nullopt; - - const size_t size = FileSystem::FSize64(fp.get()); - std::string ret; - ret.resize(size); - if (std::fread(ret.data(), size, 1, fp.get()) != 1) - { - Console.Error("Failed to read resource file '%s' to string", filename); - return std::nullopt; - } - - return ret; -} - -std::optional Host::GetResourceFileTimestamp(const char* filename) -{ - const std::string path(Path::Combine(EmuFolders::Resources, filename)); - FILESYSTEM_STAT_DATA sd; - if (!FileSystem::StatFile(filename, &sd)) - return std::nullopt; - - return sd.ModificationTime; -} - -bool Host::GetBoolSettingValue(const char* section, const char* key, bool default_value /* = false */) -{ - return default_value; -} - -std::string Host::GetStringSettingValue(const char* section, const char* key, const char* default_value /* = "" */) -{ - return default_value; -} - -void Host::ReportErrorAsync(const std::string_view& title, const std::string_view& message) -{ - wxGetApp().PostEvent(pxMessageBoxEvent( - title.empty() ? wxString() : wxString::FromUTF8(title.data(), title.length()), - message.empty() ? wxString() : wxString::FromUTF8(message.data(), message.length()), - MsgButtons().OK())); -} - -bool Host::ConfirmMessage(const std::string_view& title, const std::string_view& message) -{ - return true; -} - -bool Host::AcquireHostDisplay(RenderAPI api, bool clear_state_on_fail) -{ - sApp.OpenGsPanel(); - - // can't go anywhere if we don't have a window to render into! - if (g_gs_window_info.type == WindowInfo::Type::Surfaceless) - return false; - - g_host_display = HostDisplay::CreateForAPI(api); - if (!g_host_display) - return false; - - if (!g_host_display->CreateDevice(g_gs_window_info, Host::GetEffectiveVSyncMode()) || - !g_host_display->SetupDevice() || !ImGuiManager::Initialize()) - { - g_host_display.reset(); - return false; - } - - Console.WriteLn(Color_StrongGreen, "%s Graphics Driver Info:", HostDisplay::RenderAPIToString(g_host_display->GetRenderAPI())); - Console.Indent().WriteLn(g_host_display->GetDriverInfo()); - - return true; -} - -void Host::ReleaseHostDisplay(bool clear_state_on_fail) -{ - ImGuiManager::Shutdown(clear_state_on_fail); - - if (g_host_display) - g_host_display.reset(); - - sApp.CloseGsPanel(); -} - -bool Host::BeginPresentFrame(bool frame_skip) -{ - CheckForGSWindowResize(); - - if (!g_host_display->BeginPresent(frame_skip)) - { - // if we're skipping a frame, we need to reset imgui's state, since - // we won't be calling EndPresentFrame(). - ImGuiManager::NewFrame(); - return false; - } - - return true; -} - -void Host::EndPresentFrame() -{ - ImGuiManager::RenderOSD(); - g_host_display->EndPresent(); - ImGuiManager::NewFrame(); -} - -void Host::UpdateHostDisplay() -{ - // not used for wx -} - -void Host::ResizeHostDisplay(u32 new_window_width, u32 new_window_height, float new_window_scale) -{ - // not used for wx (except for osd scale changes) - ImGuiManager::WindowResized(); -} - -static std::atomic_bool s_gs_window_resized{false}; -static std::mutex s_gs_window_resized_lock; -static int s_new_gs_window_width = 0; -static int s_new_gs_window_height = 0; -static float s_new_gs_window_scale = 1; - -void Host::GSWindowResized(int width, int height, float scale) -{ - std::unique_lock lock(s_gs_window_resized_lock); - s_new_gs_window_width = width; - s_new_gs_window_height = height; - s_new_gs_window_scale = scale; - s_gs_window_resized.store(true); -} - -void Host::CheckForGSWindowResize() -{ - if (!s_gs_window_resized.load()) - return; - - int width, height; - float scale; - { - std::unique_lock lock(s_gs_window_resized_lock); - width = s_new_gs_window_width; - height = s_new_gs_window_height; - scale = s_new_gs_window_scale; - s_gs_window_resized.store(false); - } - - if (!g_host_display) - return; - - GSResetAPIState(); - g_host_display->ResizeWindow(width, height, scale); - GSRestoreAPIState(); - ImGuiManager::WindowResized(); -} - diff --git a/pcsx2/gui/AppHost.h b/pcsx2/gui/AppHost.h deleted file mode 100644 index 91bf5a6f9a..0000000000 --- a/pcsx2/gui/AppHost.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "Host.h" - -namespace Host -{ - // UI thread - void GSWindowResized(int width, int height, float scale); - - // MTGS thread - void CheckForGSWindowResize(); -} // namespace Host - diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp deleted file mode 100644 index acd1ee395f..0000000000 --- a/pcsx2/gui/AppInit.cpp +++ /dev/null @@ -1,748 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "MainFrame.h" -#include "AppAccelerators.h" -#include "ConsoleLogger.h" -#include "MSWstuff.h" -#include "MTVU.h" // for thread cancellation on shutdown -#include "IniInterface.h" -#include "StringHelpers.h" - -#include "common/FileSystem.h" -#include "common/StringUtil.h" -#include "DebugTools/Debug.h" -#include "Dialogs/ModalPopups.h" - -#include "Debugger/DisassemblyDialog.h" - -#include "Recording/InputRecording.h" - -#include -#include -#include -#include - -#ifdef __WXGTK__ -#include -#ifdef GDK_WINDOWING_X11 -#include -#endif -#endif // __WXGTK__ - -#ifdef SDL_BUILD -#include -#endif - -using namespace pxSizerFlags; - -static void HookSignals() -{ -#ifdef __linux__ - // Ignore SIGCHLD by default on Linux, since we kick off xdg-screensaver asynchronously. - struct sigaction sa_chld = {}; - sigemptyset(&sa_chld.sa_mask); - sa_chld.sa_flags = SA_SIGINFO | SA_RESTART | SA_NOCLDSTOP | SA_NOCLDWAIT; - sigaction(SIGCHLD, &sa_chld, nullptr); -#endif -} - -void Pcsx2App::DetectCpuAndUserMode() -{ - AffinityAssert_AllowFrom_MainUI(); - -#ifdef _M_X86 - x86caps.Identify(); - x86caps.CountCores(); - x86caps.SIMD_EstablishMXCSRmask(); - - if (!x86caps.hasStreamingSIMD4Extensions) - { - // This code will probably never run if the binary was correctly compiled for SSE4 - // SSE4 is required for any decent speed and is supported by more than decade old x86 CPUs - throw Exception::RuntimeError() - .SetDiagMsg("Critical Failure: SSE4.1 Extensions not available.") - .SetUserMsg("SSE4 extensions are not available. PCSX2 requires a cpu that supports the SSE4.1 instruction set."); - } -#endif - - EstablishAppUserMode(); - - // Check that the resources directory exists and contains our data files. - if (!FileSystem::DirectoryExists(EmuFolders::Resources.c_str())) - { - throw Exception::RuntimeError() - .SetDiagMsg("Resources directory does not exist.") - .SetUserMsg("Resources directory does not exist. Your installation is incomplete."); - } -} - -void Pcsx2App::OpenMainFrame() -{ - if (AppRpc_TryInvokeAsync(&Pcsx2App::OpenMainFrame)) - return; - - if (GetMainFramePtr() != NULL) - return; - - MainEmuFrame* mainFrame = new MainEmuFrame(NULL, pxGetAppName()); - m_id_MainFrame = mainFrame->GetId(); - - DisassemblyDialog* disassembly = new DisassemblyDialog(mainFrame); - m_id_Disassembler = disassembly->GetId(); - - if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart) - disassembly->Show(); - - PostIdleAppMethod(&Pcsx2App::OpenProgramLog); - - SetTopWindow(mainFrame); // not really needed... - SetExitOnFrameDelete(false); // but being explicit doesn't hurt... - mainFrame->Show(); -} - -void Pcsx2App::OpenProgramLog() -{ - if (AppRpc_TryInvokeAsync(&Pcsx2App::OpenProgramLog)) - return; - - if (/*ConsoleLogFrame* frame =*/GetProgramLog()) - { - //pxAssume( ); - return; - } - - wxWindow* m_current_focus = wxGetActiveWindow(); - - ScopedLock lock(m_mtx_ProgramLog); - m_ptr_ProgramLog = new ConsoleLogFrame(GetMainFramePtr(), L"PCSX2 Program Log", g_Conf->ProgLogBox); - m_id_ProgramLogBox = m_ptr_ProgramLog->GetId(); - EnableAllLogging(); - - if (m_current_focus) - m_current_focus->SetFocus(); - - // This is test code for printing out all supported languages and their canonical names in wiki-fied - // format. I might use it again soon, so I'm leaving it in for now... --air - /* - for( int li=wxLANGUAGE_UNKNOWN+1; liLanguage)) continue; - Console.WriteLn( L"|| %-30s || %-8s ||", info->Description.c_str(), info->CanonicalName.c_str() ); - } - } - */ -} - -void Pcsx2App::AllocateCoreStuffs() -{ - if (AppRpc_TryInvokeAsync(&Pcsx2App::AllocateCoreStuffs)) - return; - - SysLogMachineCaps(); - AppApplySettings(); - - if (!GetVmReserve().Allocate()) - pxFailRel("Failed to allocate memory."); - - if (!m_CpuProviders) - { - // FIXME : Some or all of SysCpuProviderPack should be run from the SysExecutor thread, - // so that the thread is safely blocked from being able to start emulation. - - m_CpuProviders = std::make_unique(); - } -} - - -void Pcsx2App::OnInitCmdLine(wxCmdLineParser& parser) -{ - parser.SetLogo(AddAppName(" >> %s -- A PlayStation 2 Emulator for the PC <<") + L"\n\n" + - _("All options are for the current session only and will not be saved.\n")); - - wxString fixlist(L" "); - for (GamefixId i = GamefixId_FIRST; i < pxEnumEnd; ++i) - { - if (i != GamefixId_FIRST) - fixlist += L","; - fixlist += EnumToString(i); - } - - parser.AddParam(_("IsoFile"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL); - parser.AddSwitch(L"h", L"help", _("displays this list of command line options"), wxCMD_LINE_OPTION_HELP); - parser.AddSwitch(wxEmptyString, L"console", _("forces the program log/console to be visible"), wxCMD_LINE_VAL_STRING); - parser.AddSwitch(wxEmptyString, L"fullscreen", _("use fullscreen GS mode")); - parser.AddSwitch(wxEmptyString, L"windowed", _("use windowed GS mode")); - - parser.AddSwitch(wxEmptyString, L"nogui", _("disables display of the gui while running games")); - parser.AddSwitch(wxEmptyString, L"noguiprompt", _("when nogui - prompt before exiting on suspend")); - - parser.AddOption(wxEmptyString, L"elf", _("executes an ELF image"), wxCMD_LINE_VAL_STRING); - parser.AddOption(wxEmptyString, L"irx", _("executes an IRX image"), wxCMD_LINE_VAL_STRING); - parser.AddSwitch(wxEmptyString, L"nodisc", _("boots an empty DVD tray; use to enter the PS2 system menu")); - parser.AddSwitch(wxEmptyString, L"usecd", _("boots from the disc drive (overrides IsoFile parameter)")); - - parser.AddSwitch(wxEmptyString, L"nohacks", _("disables all speedhacks")); - parser.AddOption(wxEmptyString, L"gamefixes", _("use the specified comma or pipe-delimited list of gamefixes.") + fixlist, wxCMD_LINE_VAL_STRING); - parser.AddSwitch(wxEmptyString, L"fullboot", _("disables fast booting")); - parser.AddOption(wxEmptyString, L"gameargs", _("passes the specified space-delimited string of launch arguments to the game"), wxCMD_LINE_VAL_STRING); - - parser.AddOption(wxEmptyString, L"cfgpath", _("changes the configuration file path"), wxCMD_LINE_VAL_STRING); - parser.AddOption(wxEmptyString, L"cfg", _("specifies the PCSX2 configuration file to use"), wxCMD_LINE_VAL_STRING); - parser.AddSwitch(wxEmptyString, L"forcewiz", AddAppName(_("forces %s to start the First-time Wizard"))); - parser.AddSwitch(wxEmptyString, L"portable", _("enables portable mode operation (requires admin/root access)")); - - parser.AddSwitch(wxEmptyString, L"profiling", _("update options to ease profiling (debug)")); - - parser.SetSwitchChars(L"-"); -} - -bool Pcsx2App::OnCmdLineError(wxCmdLineParser& parser) -{ - wxApp::OnCmdLineError(parser); - return false; -} - -static void SetGameFixOptionsFromString(Pcsx2Config::GamefixOptions& dest, const wxString& list, bool enabled) -{ - wxStringTokenizer izer(list, L",|", wxTOKEN_STRTOK); - - while (izer.HasMoreTokens()) - { - wxString token(izer.GetNextToken()); - - GamefixId i; - for (i = GamefixId_FIRST; i < pxEnumEnd; ++i) - { - if (token.CmpNoCase(EnumToString(i)) == 0) - break; - } - if (i < pxEnumEnd) - dest.Set(i); - } -} - -bool Pcsx2App::ParseOverrides(wxCmdLineParser& parser) -{ - wxString dest; - bool parsed = true; - - if (parser.Found(L"cfgpath", &dest) && !dest.IsEmpty()) - { - Console.Warning("Config path override: %ls", WX_STR(dest)); - Overrides.SettingsFolder = dest; - } - - if (parser.Found(L"cfg", &dest) && !dest.IsEmpty()) - { - Console.Warning("Config file override: %ls", WX_STR(dest)); - Overrides.VmSettingsFile = dest; - } - - Overrides.DisableSpeedhacks = parser.Found(L"nohacks"); - - Overrides.ProfilingMode = parser.Found(L"profiling"); - - if (parser.Found(L"gamefixes", &dest)) - { - Overrides.ApplyCustomGamefixes = true; - SetGameFixOptionsFromString(Overrides.Gamefixes, dest, true); - } - - if (parser.Found(L"fullscreen")) - Overrides.GsWindowMode = GsWinMode_Fullscreen; - if (parser.Found(L"windowed")) - Overrides.GsWindowMode = GsWinMode_Windowed; - - return parsed; -} - -bool Pcsx2App::OnCmdLineParsed(wxCmdLineParser& parser) -{ - if (parser.Found(L"console")) - { - Startup.ForceConsole = true; - OpenProgramLog(); - } - - // Suppress wxWidgets automatic options parsing since none of them pertain to PCSX2 needs. - //wxApp::OnCmdLineParsed( parser ); - - m_UseGUI = !parser.Found(L"nogui"); - m_NoGuiExitPrompt = parser.Found(L"noguiprompt"); // by default no prompt for exit with nogui. - - if (!ParseOverrides(parser)) - return false; - - // --- Parse Startup/Autoboot options --- - - Startup.NoFastBoot = parser.Found(L"fullboot"); - Startup.ForceWizard = parser.Found(L"forcewiz"); - Startup.PortableMode = parser.Found(L"portable"); - - if (parser.GetParamCount() >= 1) - { - Startup.IsoFile = parser.GetParam(0); - Startup.CdvdSource = CDVD_SourceType::Iso; - Startup.SysAutoRun = true; - } - else - { - wxString elf_file; - if (parser.Found(L"elf", &elf_file) && !elf_file.IsEmpty()) - Startup.SysAutoRunElf = true; - else if (parser.Found(L"irx", &elf_file) && !elf_file.IsEmpty()) - Startup.SysAutoRunIrx = true; - - if (!elf_file.IsEmpty()) - { - auto path = wxFileName(elf_file); - path.Normalize(); - Startup.ElfFile = path.GetFullPath(); - } - } - - wxString game_args; - if (parser.Found(L"gameargs", &game_args) && !game_args.IsEmpty()) - Startup.GameLaunchArgs = game_args; - - if (parser.Found(L"usecd")) - { - Startup.CdvdSource = CDVD_SourceType::Disc; - Startup.SysAutoRun = true; - } - - if (parser.Found(L"nodisc")) - { - Startup.CdvdSource = CDVD_SourceType::NoDisc; - Startup.SysAutoRun = true; - } - - return true; -} - -typedef void (wxEvtHandler::*pxInvokeAppMethodEventFunction)(Pcsx2AppMethodEvent&); -typedef void (wxEvtHandler::*pxStuckThreadEventHandler)(pxMessageBoxEvent&); - -bool Pcsx2App::OnInit() -{ - HookSignals(); - EnableAllLogging(); - Console.WriteLn("Interface is initializing. Entering Pcsx2App::OnInit!"); - - InitCPUTicks(); - - g_Conf = std::make_unique(); - wxInitAllImageHandlers(); - - Console.WriteLn("Applying operating system default language..."); - { - // The PCSX2 log system hasn't been set up yet, so error messages might - // pop up that could cause some alarm amongst users. Let's avoid that. - wxDoNotLogInThisScope please; - i18n_SetLanguage(wxLANGUAGE_DEFAULT); - } - - Console.WriteLn("Command line parsing..."); - if (!_parent::OnInit()) - return false; - Console.WriteLn("Command line parsed!"); - - i18n_SetLanguagePath(); - - Bind(wxEVT_KEY_DOWN, &Pcsx2App::OnEmuKeyDown, this, pxID_PadHandler_Keydown); - Bind(wxEVT_DESTROY, &Pcsx2App::OnDestroyWindow, this); - - // User/Admin Mode Dual Setup: - // PCSX2 now supports two fundamental modes of operation. The default is Classic mode, - // which uses the Current Working Directory (CWD) for all user data files, and requires - // Admin access on Vista (and some Linux as well). The second mode is the Vista- - // compatible \documents folder usage. The mode is determined by the presence and - // contents of a usermode.ini file in the CWD. If the ini file is missing, we assume - // the user is setting up a classic install. If the ini is present, we read the value of - // the UserMode and SettingsPath vars. - // - // Conveniently this dual mode setup applies equally well to most modern Linux distros. - - try - { - InitDefaultGlobalAccelerators(); - delete wxLog::SetActiveTarget(new pxLogConsole()); - - SysExecutorThread.Start(); - DetectCpuAndUserMode(); - - // Set Manual Exit Handling - // ---------------------------- - // PCSX2 has a lot of event handling logistics, so we *cannot* depend on wxWidgets automatic event - // loop termination code. We have a much safer system in place that continues to process messages - // until all "important" threads are closed out -- not just until the main frame is closed(-ish). - m_timer_Termination = std::make_unique(this, wxID_ANY); - Bind(wxEVT_TIMER, &Pcsx2App::OnScheduledTermination, this, m_timer_Termination->GetId()); - SetExitOnFrameDelete(false); - - - // Start GUI and/or Direct Emulation - // ------------------------------------- - pxSizerFlags::SetBestPadding(); - if (Startup.ForceConsole) - g_Conf->ProgLogBox.Visible = true; - OpenProgramLog(); - AllocateCoreStuffs(); - if (m_UseGUI) - OpenMainFrame(); - - - // By default no IRX injection - EmuConfig.CurrentIRX.clear(); - - if (Startup.SysAutoRun) - { - g_Conf->EmuOptions.UseBOOT2Injection = !Startup.NoFastBoot; - g_Conf->CdvdSource = Startup.CdvdSource; - if (Startup.CdvdSource == CDVD_SourceType::Iso) - SysUpdateIsoSrcFile(Startup.IsoFile); - sApp.SysExecute(Startup.CdvdSource); - EmuConfig.CurrentGameArgs = StringUtil::wxStringToUTF8String(Startup.GameLaunchArgs); - } - else if (Startup.SysAutoRunElf) - { - g_Conf->EmuOptions.UseBOOT2Injection = true; - - // wxPATH_NATIVE is broken on msw, it can delete the first directory after the volume - // EX: P://dir1/dir2/elf.elf -> P://dir2/ ??? -#ifdef _WIN32 - wxFileName elfFile = wxFileName(Startup.ElfFile, wxPATH_WIN); -#else - wxFileName elfFile = wxFileName(Startup.ElfFile, wxPATH_NATIVE); -#endif - - if (!elfFile.FileExists()) - { - wxMessageBox(wxString::Format(_("Specified elf file %s does not exist!"), Startup.ElfFile), "PCSX2", wxICON_ERROR); - } - else - { - g_Conf->Folders.RunELF = elfFile.GetPath(); - sApp.SysExecute(Startup.CdvdSource, Startup.ElfFile); - if (Startup.ElfFile.Find(' ') == -1) - EmuConfig.CurrentGameArgs = StringUtil::wxStringToUTF8String(Startup.GameLaunchArgs); - } - } - else if (Startup.SysAutoRunIrx) - { - g_Conf->EmuOptions.UseBOOT2Injection = true; - - EmuConfig.CurrentIRX = StringUtil::wxStringToUTF8String(Startup.ElfFile); - - // FIXME: ElfFile is an irx it will crash - sApp.SysExecute(Startup.CdvdSource, Startup.ElfFile); - if (Startup.ElfFile.Find(' ') == -1) - EmuConfig.CurrentGameArgs = StringUtil::wxStringToUTF8String(Startup.GameLaunchArgs); - } - } - // ---------------------------------------------------------------------------- - catch (Exception::StartupAborted& ex) // user-aborted, no popups needed. - { - Console.Warning(ex.FormatDiagnosticMessage()); - CleanupOnExit(); - return false; - } - // ---------------------------------------------------------------------------- - // Failures on the core initialization procedure (typically OutOfMemory errors) are bad, - // since it means the emulator is completely non-functional. Let's pop up an error and - // exit gracefully-ish. - // - catch (Exception::RuntimeError& ex) - { - Console.Error(ex.FormatDiagnosticMessage()); - Msgbox::Alert(StringUtil::UTF8StringToWxString(ex.FormatDisplayMessage()) + L"\n\n" + AddAppName(_("Press OK to close %s.")), - AddAppName(_("%s Critical Error")), wxICON_ERROR); - CleanupOnExit(); - return false; - } - -#ifdef SDL_BUILD - // MacOS Game Controller framework requires a few runs of the main event loop after interest in game controllers is first indicated to connect controllers - // Since OnePad doesn't currently handle connection/disconnection events and requires controllers to be connected on start, we need to initialize SDL before OnePad looks at the controller list - SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1"); - SDL_Init(SDL_INIT_GAMECONTROLLER); -#endif - return true; -} - -static int m_term_threshold = 20; - -void Pcsx2App::OnScheduledTermination(wxTimerEvent& evt) -{ - if (!pxAssertDev(m_ScheduledTermination, "Scheduled Termination check is inconsistent with ScheduledTermination status.")) - { - m_timer_Termination->Stop(); - return; - } - - if (m_PendingSaves != 0) - { - if (--m_term_threshold > 0) - { - Console.WriteLn("(App) %d saves are still pending; exit postponed...", m_PendingSaves); - return; - } - - Console.Error("(App) %s pending saves have exceeded OnExit threshold and are being prematurely terminated!", m_PendingSaves); - } - - m_timer_Termination->Stop(); - Exit(); -} - - -// Common exit handler which can be called from any event (though really it should -// be called only from CloseWindow handlers since that's the more appropriate way -// to handle cancelable window closures) -// -// returns true if the app can close, or false if the close event was canceled by -// the glorious user, whomever (s)he-it might be. -void Pcsx2App::PrepForExit() -{ - if (m_ScheduledTermination) - return; - m_ScheduledTermination = true; - - DispatchEvent(AppStatus_Exiting); - - CoreThread.Cancel(); - SysExecutorThread.ShutdownQueue(); - - m_timer_Termination->Start(500); -} - -// This cleanup procedure can only be called when the App message pump is still active. -// OnExit() must use CleanupOnExit instead. -void Pcsx2App::CleanupRestartable() -{ - AffinityAssert_AllowFrom_MainUI(); - - CoreThread.Cancel(); - SysExecutorThread.ShutdownQueue(); - IdleEventDispatcher(L"Cleanup"); - - if (g_Conf) - AppSaveSettings(); -} - -// This cleanup handler can be called from OnExit (it doesn't need a running message pump), -// but should not be called from the App destructor. It's needed because wxWidgets doesn't -// always call OnExit(), so I had to make CleanupRestartable, and then encapsulate it here -// to be friendly to the OnExit scenario (no message pump). -void Pcsx2App::CleanupOnExit() -{ - AffinityAssert_AllowFrom_MainUI(); - - try - { - CleanupRestartable(); - CleanupResources(); - } - catch (Exception::CancelEvent&) - { - throw; - } - catch (Exception::RuntimeError& ex) - { - // Handle runtime errors gracefully during shutdown. Mostly these are things - // that we just don't care about by now, and just want to "get 'er done!" so - // we can exit the app. ;) - - Console.Error("Runtime exception handled during CleanupOnExit:\n"); - Console.Indent().Error(ex.FormatDiagnosticMessage()); - } - - // FIXME: performing a wxYield() here may fix that problem. -- air - - Console_SetActiveHandler(ConsoleWriter_Stdout); -} - -void Pcsx2App::CleanupResources() -{ - ScopedBusyCursor cursor(Cursor_ReallyBusy); - //delete wxConfigBase::Set( NULL ); - - while (wxGetLocale() != NULL) - delete wxGetLocale(); - - m_mtx_LoadingGameDB.Wait(); - ScopedLock lock(m_mtx_Resources); - m_Resources = NULL; -} - -int Pcsx2App::OnExit() -{ - CleanupOnExit(); - return wxApp::OnExit(); -} - -void Pcsx2App::OnDestroyWindow(wxWindowDestroyEvent& evt) -{ - // Precautions: - // * Whenever windows are destroyed, make sure to check if it matches our "active" - // console logger. If so, we need to disable logging to the console window, or else - // it'll crash. (this is because the console log system uses a cached window handle - // instead of looking the window up via it's ID -- fast but potentially unsafe). - - - OnProgramLogClosed(evt.GetId()); - OnGsFrameClosed(evt.GetId()); - evt.Skip(); -} - -// -------------------------------------------------------------------------------------- -// SysEventHandler -// -------------------------------------------------------------------------------------- -class SysEvtHandler : public pxEvtQueue -{ -public: - wxString GetEvtHandlerName() const { return L"SysExecutor"; } - -protected: - // When the SysExec message queue is finally empty, we should check the state of - // the menus and make sure they're all consistent to the current emulation states. - void _DoIdle() - { - UI_UpdateSysControls(); - } -}; - - -Pcsx2App::Pcsx2App() - : SysExecutorThread(new SysEvtHandler()) - , m_id_MainFrame(wxID_ANY) - , m_id_GsFrame(wxID_ANY) - , m_id_ProgramLogBox(wxID_ANY) - , m_id_Disassembler(wxID_ANY) -{ -// Warning: Do not delete this comment block! Gettext will parse it to allow -// the translation of some wxWidget internal strings. -- greg -#if 0 - { - // Some common labels provided by wxWidgets. wxWidgets translation files are chucked full - // of worthless crap, and tally more than 200k each. We only need these couple. - - _("OK"); - _("&OK"); - _("Cancel"); - _("&Cancel"); - _("&Apply"); - _("&Next >"); - _("< &Back"); - _("&Back"); - _("&Finish"); - _("&Yes"); - _("&No"); - _("Browse"); - _("&Save"); - _("Save &As..."); - _("&Help"); - _("&Home"); - _("&Window"); - - _("Show about dialog.") - } -#endif - -#ifdef GDK_WINDOWING_X11 - // This *must* be done in the constructor, before wx starts making X calls. - XInitThreads(); -#endif - - m_PendingSaves = 0; - m_ScheduledTermination = false; - m_UseGUI = true; - m_NoGuiExitPrompt = true; - - m_ptr_ProgramLog = NULL; - - SetAppName(L"PCSX2"); - BuildCommandHash(); -} - -Pcsx2App::~Pcsx2App() -{ -} - -void Pcsx2App::CleanUp() -{ - CleanupResources(); - m_Resources = NULL; - m_RecentIsoList = NULL; - - DisableDiskLogging(); - - if (emuLog != NULL) - { - fclose(emuLog); - emuLog = NULL; - } - - _parent::CleanUp(); -} - -__fi wxString AddAppName(const wxString& fmt) -{ - return pxsFmt(fmt, WX_STR(pxGetAppName())); -} - -__fi wxString AddAppName(const wxChar* fmt) -{ - return pxsFmt(fmt, WX_STR(pxGetAppName())); -} - -__fi wxString AddAppName(const char* fmt) -{ - return pxsFmt(fromUTF8(fmt), WX_STR(pxGetAppName())); -} - -// ------------------------------------------------------------------------------------------ -// Using the MSVCRT to track memory leaks: -// ------------------------------------------------------------------------------------------ -// When exiting PCSX2 normally, the CRT will make a list of all memory that's leaked. The -// number inside {} can be pasted into the line below to cause MSVC to breakpoint on that -// allocation at the time it's made. And then using a stacktrace you can figure out what -// leaked! :D -// -// Limitations: Unfortunately, wxWidgets gui uses a lot of heap allocations while handling -// messages, and so any mouse movements will pretty much screw up the leak value. So to use -// this feature you need to execute pcsx in no-gui mode, and then not move the mouse or use -// the keyboard until you get to the leak. >_< -// -// (but this tool is still better than nothing!) - -#ifdef PCSX2_DEBUG -struct CrtDebugBreak -{ - CrtDebugBreak(int spot) - { -#ifdef __WXMSW__ - _CrtSetBreakAlloc(spot); -#endif - } -}; - -//CrtDebugBreak breakAt( 11549 ); - -#endif diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp deleted file mode 100644 index b849c709d2..0000000000 --- a/pcsx2/gui/AppMain.cpp +++ /dev/null @@ -1,964 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "MainFrame.h" -#include "GSFrame.h" -#include "GS.h" -#include "Host.h" -#include "AppSaveStates.h" -#include "AppAccelerators.h" -#include "IniInterface.h" -#include "PAD/Gamepad.h" - -#include "ps2/BiosTools.h" - -#include "Dialogs/ModalPopups.h" -#include "Dialogs/ConfigurationDialog.h" -#include "Dialogs/LogOptionsDialog.h" - -#include "Debugger/DisassemblyDialog.h" - -#include "Recording/InputRecordingControls.h" -#include "Recording/InputRecording.h" - -#include "common/FileSystem.h" -#include "common/StringUtil.h" -#include "AppTrait.h" - -#include - -#ifdef __WXMSW__ -# include // needed to implement the app! -#endif - -#ifdef __WXGTK__ -#include -#include - -#ifdef GDK_WINDOWING_WAYLAND -#include -#endif -#endif - -// Safe to remove these lines when this is handled properly. -#ifdef __WXMAC__ -// Great joy.... -#undef EBP -#undef ESP -#undef EDI -#undef ESI -#undef EDX -#undef EAX -#undef EBX -#undef ECX -#include // needed to implement the app! -#endif -wxIMPLEMENT_APP(Pcsx2App); - -std::unique_ptr g_Conf; - -WindowInfo g_gs_window_info; - -static bool CheckForBIOS() -{ - if (IsBIOSAvailable(g_Conf->EmuOptions.FullpathToBios())) - return true; - - wxString error = pxE(L"PCSX2 requires a PS2 BIOS in order to run. For legal reasons, you *must* obtain a BIOS from an actual PS2 unit that you own (borrowing doesn't count). Please consult the FAQs and Guides for further instructions."); - - Msgbox::Alert(error, _("PS2 BIOS Error")); - return false; -} - -// Allows for activating menu actions from anywhere in PCSX2. -// And it's Thread Safe! -void Pcsx2App::PostMenuAction( MenuIdentifiers menu_id ) const -{ - MainEmuFrame* mainFrame = GetMainFramePtr(); - if( mainFrame == NULL ) return; - - wxCommandEvent joe( wxEVT_MENU, menu_id ); - if( wxThread::IsMain() ) - mainFrame->GetEventHandler()->ProcessEvent( joe ); - else - mainFrame->GetEventHandler()->AddPendingEvent( joe ); -} - -#ifdef _WIN32 - -// -------------------------------------------------------------------------------------- -// Exception::WinApiError (implementations) -// -------------------------------------------------------------------------------------- -Exception::WinApiError::WinApiError() -{ - ErrorId = GetLastError(); - m_message_diag = "Unspecified Windows API error."; -} - -std::string Exception::WinApiError::GetMsgFromWindows() const -{ - if (!ErrorId) - return "No valid error number was assigned to this exception!"; - - const DWORD BUF_LEN = 2048; - wchar_t t_Msg[BUF_LEN]; - if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, 0, ErrorId, 0, t_Msg, BUF_LEN, 0)) - return fmt::format("Win32 Error #{}: {}", ErrorId, StringUtil::WideStringToUTF8String(t_Msg)); - - return fmt::format("Win32 Error #{} (no text msg available)", ErrorId); -} - -std::string Exception::WinApiError::FormatDisplayMessage() const -{ - return m_message_user + "\n\n" + GetMsgFromWindows(); -} - -std::string Exception::WinApiError::FormatDiagnosticMessage() const -{ - return m_message_diag + "\n\t" + GetMsgFromWindows(); -} - -#endif - - -// -------------------------------------------------------------------------------------- -// Pcsx2AppMethodEvent -// -------------------------------------------------------------------------------------- -// Unlike pxPingEvent, the Semaphore belonging to this event is typically posted when the -// invoked method is completed. If the method can be executed in non-blocking fashion then -// it should leave the semaphore postback NULL. -// -class Pcsx2AppMethodEvent : public pxActionEvent -{ - typedef pxActionEvent _parent; - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(Pcsx2AppMethodEvent); - -protected: - FnPtr_Pcsx2App m_Method; - -public: - virtual ~Pcsx2AppMethodEvent() = default; - virtual Pcsx2AppMethodEvent *Clone() const { return new Pcsx2AppMethodEvent(*this); } - - explicit Pcsx2AppMethodEvent( FnPtr_Pcsx2App method=NULL, SynchronousActionState* sema=NULL ) - : pxActionEvent( sema ) - { - m_Method = method; - } - - explicit Pcsx2AppMethodEvent( FnPtr_Pcsx2App method, SynchronousActionState& sema ) - : pxActionEvent( sema ) - { - m_Method = method; - } - - Pcsx2AppMethodEvent( const Pcsx2AppMethodEvent& src ) - : pxActionEvent( src ) - { - m_Method = src.m_Method; - } - - void SetMethod( FnPtr_Pcsx2App method ) - { - m_Method = method; - } - -protected: - void InvokeEvent() - { - if( m_Method ) (wxGetApp().*m_Method)(); - } -}; - - -wxIMPLEMENT_DYNAMIC_CLASS( Pcsx2AppMethodEvent, pxActionEvent ); - -#ifdef __WXMSW__ -extern int TranslateVKToWXK(u32 keysym); -#elif defined(__WXGTK__) -extern int TranslateGDKtoWXK(u32 keysym); -#elif defined(__APPLE__) -extern int TranslateOSXtoWXK(u32 keysym); -#endif - -void Pcsx2App::PadKeyDispatch(const HostKeyEvent& ev) -{ - m_kevt.SetEventType( ( ev.type == HostKeyEvent::Type::KeyPressed ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ); - -//returns 0 for normal keys and a WXK_* value for special keys -#ifdef __WXMSW__ - const int vkey = TranslateVKToWXK(ev.key); -#elif defined( __WXMAC__ ) - const int vkey = TranslateOSXtoWXK(ev.key); -#elif defined( __WXGTK__ ) - const int vkey = TranslateGDKtoWXK(ev.key); -#else -# error Unsupported Target Platform. -#endif - - // Don't rely on current event handling to get the state of those specials keys. - // Typical linux bug: hit ctrl-alt key to switch the desktop. Key will be released - // outside of the window so the app isn't aware of the current key state. - m_kevt.m_shiftDown = wxGetKeyState(WXK_SHIFT); - m_kevt.m_controlDown = wxGetKeyState(WXK_CONTROL); - m_kevt.m_altDown = wxGetKeyState(WXK_MENU) || wxGetKeyState(WXK_ALT); - - m_kevt.m_keyCode = vkey? vkey : ev.key; - - if (DevConWriterEnabled && m_kevt.GetEventType() == wxEVT_KEY_DOWN) { - wxString strFromCode = wxAcceleratorEntry( - (m_kevt.m_shiftDown ? wxACCEL_SHIFT : 0) | (m_kevt.m_controlDown ? wxACCEL_CTRL : 0) | (m_kevt.m_altDown ? wxACCEL_ALT : 0), - m_kevt.m_keyCode - ).ToString(); - - if (strFromCode.EndsWith(L"\\")) - strFromCode += L"\\"; // If copied into PCSX2_keys.ini, \ needs escaping - - Console.WriteLn(StringUtil::wxStringToUTF8String(wxString::Format("> Key: %s (Code: %ld)", WX_STR(strFromCode), m_kevt.m_keyCode))); - } - - if( m_kevt.GetEventType() == wxEVT_KEY_DOWN ) - { - if( GSFrame* gsFrame = wxGetApp().GetGsFramePtr() ) - { - gsFrame->GetViewport()->DirectKeyCommand( m_kevt ); - } - else - { - m_kevt.SetId( pxID_PadHandler_Keydown ); - wxGetApp().ProcessEvent( m_kevt ); - } - } -} - -// -------------------------------------------------------------------------------------- -// Pcsx2AppTraits (implementations) [includes pxMessageOutputMessageBox] -// -------------------------------------------------------------------------------------- -// This is here to override pxMessageOutputMessageBox behavior, which itself is ONLY used -// by wxWidgets' command line processor. The default edition is totally inadequate for -// displaying a readable --help command line list, so I replace it here with a custom one -// that formats things nicer. -// - -// This is only used in Windows. It's not possible to have wxWidgets show a localised -// command line help message in cmd/powershell/mingw bash. It can be done in English -// locales ( using AttachConsole, WriteConsole, FreeConsole combined with -// wxMessageOutputStderr), but completely fails for some other languages (i.e. Japanese). -#ifdef _WIN32 -class pxMessageOutputMessageBox : public wxMessageOutput -{ -public: - pxMessageOutputMessageBox() { } - - // DoPrintf in wxMessageOutputBase (wxWidgets 3.0) uses this. - virtual void Output(const wxString &out); -}; - -// EXTRAORDINARY HACK! wxWidgets does not provide a clean way of overriding the commandline options -// display dialog. The default one uses operating system built-in message/notice windows, which are -// appaling, ugly, and not at all suited to a large number of command line options. Fortunately, -// wxMessageOutputMessageBox::PrintF is only used in like two places, so we can just check for the -// commandline window using an identifier we know is contained in it, and then format our own window -// display. :D --air - -void pxMessageOutputMessageBox::Output(const wxString& out) -{ - using namespace pxSizerFlags; - - wxString isoFormatted; - isoFormatted.Printf(L"[%s]", _("IsoFile")); - - int pos = out.Find(isoFormatted.c_str()); - - // I've no idea when this is true. - if (pos == wxNOT_FOUND) - { - Msgbox::Alert( out ); return; - } - - pos += isoFormatted.Length(); - - wxDialogWithHelpers popup( NULL, AddAppName(_("%s Commandline Options")) ); - popup.SetMinWidth( 640 ); - popup += popup.Heading(out.Mid(0, pos)); - //popup += ; - //popup += popup.Text(out.Mid(pos, out.Length())).Align( wxALIGN_LEFT ) | pxExpand.Border(wxALL, StdPadding*3); - - wxTextCtrl* traceArea = new wxTextCtrl( - &popup, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxTE_READONLY | wxTE_MULTILINE | wxTE_RICH2 | wxHSCROLL - ); - - traceArea->SetDefaultStyle( wxTextAttr( wxNullColour, wxNullColour, pxGetFixedFont(9) ) ); - traceArea->SetFont( pxGetFixedFont(9) ); - - int fonty = traceArea->GetCharHeight(); - - traceArea->SetMinSize( wxSize( traceArea->GetMinWidth(), (fonty+1)*18 ) ); - traceArea->WriteText( pxTextWrapper(wxString(L' ', 18)).Wrap(traceArea, out.Mid(pos, out.Length()), 600).GetResult() ); - traceArea->SetInsertionPoint( 0 ); - traceArea->ShowPosition( 0 ); - - popup += traceArea | pxExpand.Border(wxALL, StdPadding*3); - - pxIssueConfirmation(popup, MsgButtons().Close() ); -} -#endif - -wxMessageOutput* Pcsx2AppTraits::CreateMessageOutput() -{ -#ifdef __UNIX__ - return _parent::CreateMessageOutput(); -#else - return new pxMessageOutputMessageBox; -#endif -} - -// -------------------------------------------------------------------------------------- -// Pcsx2StandardPaths -// -------------------------------------------------------------------------------------- -#ifdef wxUSE_STDPATHS -#ifndef __APPLE__ // macOS uses wx's defaults -class Pcsx2StandardPaths : public wxStandardPaths -{ -public: - wxString GetResourcesDir() const - { - return Path::CombineWx( GetDataDir(), L"Langs" ); - } - -#ifdef __POSIX__ - wxString GetUserLocalDataDir() const - { - // I got memory corruption inside wxGetEnv when I heavily toggle the GS renderer (F9). It seems wxGetEnv - // isn't thread safe? To avoid any issue on this read only variable, I cache the result. - static wxString cache_dir; - if (!cache_dir.IsEmpty()) return cache_dir; - - // Note: GetUserLocalDataDir() on linux return $HOME/.pcsx2 unfortunately it does not follow the XDG standard - // So we re-implement it, to follow the standard. - wxDirName user_local_dir; - wxDirName default_config_dir = (wxDirName)Path::CombineWx( L".config", pxGetAppName() ); - wxString xdg_home_value; - if( wxGetEnv(L"XDG_CONFIG_HOME", &xdg_home_value) ) { - if ( xdg_home_value.IsEmpty() ) { - // variable exist but it is empty. So use the default value - user_local_dir = (wxDirName)Path::CombineWx( GetUserConfigDir() , default_config_dir); - } else { - user_local_dir = (wxDirName)Path::CombineWx( xdg_home_value, pxGetAppName()); - } - } else { - // variable do not exist - user_local_dir = (wxDirName)Path::CombineWx( GetUserConfigDir() , default_config_dir); - } - - cache_dir = user_local_dir.ToString(); - - return cache_dir; - } -#endif - -}; -#endif // ifdef __APPLE__ - -wxStandardPaths& Pcsx2AppTraits::GetStandardPaths() -{ -#ifdef __APPLE__ - return _parent::GetStandardPaths(); -#else - static Pcsx2StandardPaths stdPaths; - return stdPaths; -#endif -} -#endif - -wxAppTraits* Pcsx2App::CreateTraits() -{ - return new Pcsx2AppTraits; -} - -// ---------------------------------------------------------------------------- -// Pcsx2App Event Handlers -// ---------------------------------------------------------------------------- - -// LogicalVsync - Event received from the AppCoreThread (EEcore) for each vsync, -// roughly 50/60 times a second when frame limiting is enabled, and up to 10,000 -// times a second if not (ok, not quite, but you get the idea... I hope.) -void Pcsx2App::LogicalVsync() -{ - if( AppRpc_TryInvokeAsync( &Pcsx2App::LogicalVsync ) ) return; - - if( !SysHasValidState() ) return; - - if( (wxGetApp().GetGsFramePtr() != NULL) ) - PADupdate(0); - - while( const HostKeyEvent* ev = PADkeyEvent() ) - { - if( ev->key == 0 ) break; - - // in the past, in the plugin api, all plugins would have a first chance at treating the - // input here, with the ui eventually dealing with it otherwise. Obviously this solution - // sucked and we had multiple components battling for input processing. I managed to make - // most of them go away during the plugin merge but GS still needs to process the inputs, - // we might want to move all the input handling in a frontend-specific file in the future -- govanify - GSkeyEvent(*ev); - PadKeyDispatch( *ev ); - } -} - -void Pcsx2App::OnEmuKeyDown( wxKeyEvent& evt ) -{ - const GlobalCommandDescriptor* cmd = NULL; - if (GlobalAccels) - { - std::unordered_map::const_iterator iter(GlobalAccels->find(KeyAcceleratorCode(evt).val32)); - if (iter != GlobalAccels->end()) - cmd = iter->second; - } - - if( cmd == NULL ) - { - evt.Skip(); - return; - } - - DbgCon.WriteLn( "(app) Invoking command: %s", cmd->Id ); - cmd->Invoke(); -} - -void Pcsx2App::HandleEvent(wxEvtHandler* handler, wxEventFunction func, wxEvent& event) const -{ - const_cast(this)->HandleEvent( handler, func, event ); -} - -void Pcsx2App::HandleEvent(wxEvtHandler* handler, wxEventFunction func, wxEvent& event) -{ - try - { - (handler->*func)(event); - } - // ---------------------------------------------------------------------------- - catch( Exception::StartupAborted& ex ) // user-aborted, no popups needed. - { - Console.Warning( ex.FormatDiagnosticMessage() ); - Exit(); - } - // ---------------------------------------------------------------------------- - catch( Exception::SaveStateLoadError& ex) - { - // Saved state load failed prior to the system getting corrupted (ie, file not found - // or some zipfile error) -- so log it and resume emulation. - Console.Warning( ex.FormatDiagnosticMessage() ); - CoreThread.Resume(); - } - // ---------------------------------------------------------------------------- - #if 0 - catch( Exception::ThreadDeadlock& ex ) - { - // [TODO] Bind a listener to the CoreThread status, and automatically close the dialog - // if the thread starts responding while we're waiting (not hard in fact, but I'm getting - // a little tired, so maybe later!) --air - - Console.Warning( ex.FormatDiagnosticMessage() ); - wxDialogWithHelpers dialog( NULL, _("PCSX2 Unresponsive Thread"), wxVERTICAL ); - - dialog += dialog.Heading( ex.FormatDisplayMessage() + L"\n\n" + - pxE( L"'Ignore' to continue waiting for the thread to respond.\n'Cancel' to attempt to cancel the thread.\n'Terminate' to quit PCSX2 immediately.\n" - ) - ); - - int result = pxIssueConfirmation( dialog, MsgButtons().Ignore().Cancel().Custom( _("Terminate") ) ); - - if( result == pxID_CUSTOM ) - { - // fastest way to kill the process! (works in Linux and win32, thanks to windows having very - // limited Posix Signals support) - // - // (note: SIGTERM is a "handled" kill that performs shutdown stuff, which typically just crashes anyway) - wxKill( wxGetProcessId(), wxSIGKILL ); - } - else if( result == wxID_CANCEL ) - { - // Attempt to cancel the thread: - ex.Thread().Cancel(); - } - - // Ignore does nothing... - } - #endif - // ---------------------------------------------------------------------------- - catch( Exception::CancelEvent& ex ) - { - Console.Warning( ex.FormatDiagnosticMessage() ); - } - catch( Exception::RuntimeError& ex ) - { - // Runtime errors which have been unhandled should still be safe to recover from, - // so lets issue a message to the user and then continue the message pump. - - // Test case (Windows only, Linux has an uncaught exception for some - // reason): Run PSX ISO using fast boot - if (GSFrame* gsframe = wxGetApp().GetGsFramePtr()) - gsframe->Close(); - - Console.Error( ex.FormatDiagnosticMessage() ); - // I should probably figure out how to have the error message as well. - if (wxGetApp().HasGUI()) - Msgbox::Alert(StringUtil::UTF8StringToWxString(ex.FormatDisplayMessage())); - } -} - -bool Pcsx2App::HasPendingSaves() const -{ - AffinityAssert_AllowFrom_MainUI(); - return !!m_PendingSaves; -} - -// A call to this method informs the app that there is a pending save operation that must be -// finished prior to exiting the app, or else data loss will occur. Any call to this method -// should be matched by a call to ClearPendingSave(). -void Pcsx2App::StartPendingSave() -{ - if( AppRpc_TryInvokeAsync(&Pcsx2App::StartPendingSave) ) return; - ++m_PendingSaves; -} - -// If this method is called inappropriately then the entire pending save system will become -// unreliable and data loss can occur on app exit. Devel and debug builds will assert if -// such calls are detected (though the detection is far from fool-proof). -void Pcsx2App::ClearPendingSave() -{ - if( AppRpc_TryInvokeAsync(&Pcsx2App::ClearPendingSave) ) return; - - --m_PendingSaves; - pxAssertDev( m_PendingSaves >= 0, "Pending saves count mismatch (pending count is less than 0)" ); - - if( (m_PendingSaves == 0) && m_ScheduledTermination ) - { - Console.WriteLn( "App: All pending saves completed; exiting!" ); - Exit(); - } -} - -// This method generates debug assertions if the MainFrame handle is NULL (typically -// indicating that PCSX2 is running in NoGUI mode, or that the main frame has been -// closed). In most cases you'll want to use HasMainFrame() to test for thread -// validity first, or use GetMainFramePtr() and manually check for NULL (choice -// is a matter of programmer preference). -MainEmuFrame& Pcsx2App::GetMainFrame() const -{ - MainEmuFrame* mainFrame = GetMainFramePtr(); - - pxAssert(mainFrame != NULL); - pxAssert(((uptr)GetTopWindow()) == ((uptr)mainFrame)); - return *mainFrame; -} - -GSFrame& Pcsx2App::GetGsFrame() const -{ - GSFrame* gsFrame = (GSFrame*)wxWindow::FindWindowById( m_id_GsFrame ); - pxAssert(gsFrame != NULL); - return *gsFrame; -} - -void Pcsx2App::enterDebugMode() -{ - DisassemblyDialog* dlg = GetDisassemblyPtr(); - if (dlg) - dlg->setDebugMode(true,false); -} - -void Pcsx2App::leaveDebugMode() -{ - DisassemblyDialog* dlg = GetDisassemblyPtr(); - if (dlg) - dlg->setDebugMode(false,false); -} - -void Pcsx2App::resetDebugger() -{ - DisassemblyDialog* dlg = GetDisassemblyPtr(); - if (dlg) - dlg->reset(); -} - -void AppApplySettings( const AppConfig* oldconf ) -{ - AffinityAssert_AllowFrom_MainUI(); - - ScopedCoreThreadPause paused_core; - - g_Conf->Folders.ApplyDefaults(); - - // Ensure existence of necessary documents folders. - // Other parts of PCSX2 rely on them. - - g_Conf->Folders.MemoryCards.Mkdir(); - g_Conf->Folders.Savestates.Mkdir(); - g_Conf->Folders.Snapshots.Mkdir(); - g_Conf->Folders.Cheats.Mkdir(); - g_Conf->Folders.CheatsWS.Mkdir(); - g_Conf->Folders.Textures.Mkdir(); - - RelocateLogfile(); - - if( (oldconf == NULL) || (oldconf->LanguageCode.CmpNoCase(g_Conf->LanguageCode)) ) - { - wxDoNotLogInThisScope please; - i18n_SetLanguage( g_Conf->LanguageId, g_Conf->LanguageCode ); - } - - // Update the compression attribute on the Memcards folder. - // Memcards generally compress very well via NTFS compression. - - #ifdef _WIN32 - FileSystem::SetPathCompression( g_Conf->Folders.MemoryCards.ToUTF8(), g_Conf->EmuOptions.McdCompressNTFS ); - #endif - sApp.DispatchEvent( AppStatus_SettingsApplied ); - - paused_core.AllowResume(); -} - -// Invokes the specified Pcsx2App method, or posts the method to the main thread if the calling -// thread is not Main. Action is blocking. For non-blocking method execution, use -// AppRpc_TryInvokeAsync. -// -// This function works something like setjmp/longjmp, in that the return value indicates if the -// function actually executed the specified method or not. -// -// Returns: -// FALSE if the method was not posted to the main thread (meaning this IS the main thread!) -// TRUE if the method was posted. -// -bool Pcsx2App::AppRpc_TryInvoke( FnPtr_Pcsx2App method ) -{ - if( wxThread::IsMain() ) return false; - - SynchronousActionState sync; - PostEvent( Pcsx2AppMethodEvent( method, sync ) ); - sync.WaitForResult(); - - return true; -} - -// Invokes the specified Pcsx2App method, or posts the method to the main thread if the calling -// thread is not Main. Action is non-blocking. For blocking method execution, use -// AppRpc_TryInvoke. -// -// This function works something like setjmp/longjmp, in that the return value indicates if the -// function actually executed the specified method or not. -// -// Returns: -// FALSE if the method was not posted to the main thread (meaning this IS the main thread!) -// TRUE if the method was posted. -// -bool Pcsx2App::AppRpc_TryInvokeAsync( FnPtr_Pcsx2App method ) -{ - if( wxThread::IsMain() ) return false; - PostEvent( Pcsx2AppMethodEvent( method ) ); - return true; -} - -// Posts a method to the main thread; non-blocking. Post occurs even when called from the -// main thread. -void Pcsx2App::PostAppMethod( FnPtr_Pcsx2App method ) -{ - PostEvent( Pcsx2AppMethodEvent( method ) ); -} - -// Posts a method to the main thread; non-blocking. Post occurs even when called from the -// main thread. -void Pcsx2App::PostIdleAppMethod( FnPtr_Pcsx2App method ) -{ - Pcsx2AppMethodEvent evt( method ); - AddIdleEvent( evt ); -} - -SysMainMemory& Pcsx2App::GetVmReserve() -{ - if (!m_VmReserve) m_VmReserve = std::unique_ptr(new SysMainMemory()); - return *m_VmReserve; -} - -void Pcsx2App::OpenGsPanel() -{ - if( AppRpc_TryInvoke( &Pcsx2App::OpenGsPanel ) ) return; - - GSFrame* gsFrame = GetGsFramePtr(); - if( gsFrame == NULL ) - { - gsFrame = new GSFrame(GetAppName() ); - m_id_GsFrame = gsFrame->GetId(); - - switch( wxGetApp().Overrides.GsWindowMode ) - { - case GsWinMode_Windowed: - g_Conf->GSWindow.IsFullscreen = false; - break; - - case GsWinMode_Fullscreen: - g_Conf->GSWindow.IsFullscreen = true; - break; - - case GsWinMode_Unspecified: - g_Conf->GSWindow.IsFullscreen = g_Conf->GSWindow.DefaultToFullscreen; - break; - } - } - else - { - // This is an attempt to hackfix a bug in nvidia's 195.xx drivers: When using - // Aero and DX10, the driver fails to update the window after the device has changed, - // until some event like a hide/show or resize event is posted to the window. - // Presumably this forces the driver to re-cache the visibility info. - // Notes: - // Doing an immediate hide/show didn't work. So now I'm trying a resize. Because - // wxWidgets is "clever" (grr!) it optimizes out just force-setting the same size - // over again, so instead I resize it to size-1 and then back to the original size. - // - // FIXME: GS memory leaks in DX10 have been fixed. This code may not be needed - // anymore. - - const wxSize oldsize( gsFrame->GetSize() ); - wxSize newsize( oldsize ); - newsize.DecBy(1); - - gsFrame->SetSize( newsize ); - gsFrame->SetSize( oldsize ); - } - - gsFrame->ShowFullScreen(g_Conf->GSWindow.IsFullscreen); - wxApp::ProcessPendingEvents(); - - std::optional wi = gsFrame->GetViewport()->GetWindowInfo(); - pxAssertDev(wi.has_value(), "GS frame has a valid native window"); - g_gs_window_info = std::move(*wi); -} - - -void Pcsx2App::CloseGsPanel() -{ - if (AppRpc_TryInvoke(&Pcsx2App::CloseGsPanel)) - return; - - GSFrame* gsFrame = GetGsFramePtr(); - if (gsFrame) - { - // we unreference the window first, that way it doesn't try to suspend on close and deadlock - OnGsFrameDestroyed(gsFrame->GetId()); - gsFrame->Destroy(); - } -} - -void Pcsx2App::OnGsFrameClosed(wxWindowID id) -{ - if ((m_id_GsFrame == wxID_ANY) || (m_id_GsFrame != id)) - return; - - CoreThread.Suspend(); - - if (!m_UseGUI) - { - // The user is prompted before suspending (at Sys_Suspend() ), because - // right now there's no way to resume from suspend without GUI. - PrepForExit(); - } -} - -void Pcsx2App::OnGsFrameDestroyed(wxWindowID id) -{ - if ((m_id_GsFrame == wxID_ANY) || (m_id_GsFrame != id)) - return; - - m_id_GsFrame = wxID_ANY; - g_gs_window_info = {}; -} - -void Pcsx2App::OnProgramLogClosed( wxWindowID id ) -{ - if( (m_id_ProgramLogBox == wxID_ANY) || (m_id_ProgramLogBox != id) ) return; - - ScopedLock lock( m_mtx_ProgramLog ); - m_id_ProgramLogBox = wxID_ANY; - DisableWindowLogging(); -} - -void Pcsx2App::OnMainFrameClosed( wxWindowID id ) -{ - // Nothing threaded depends on the mainframe (yet) -- it all passes through the main wxApp - // message handler. But that might change in the future. - if( m_id_MainFrame != id ) return; - m_id_MainFrame = wxID_ANY; -} - -// -------------------------------------------------------------------------------------- -// SysExecEvent_Execute -// -------------------------------------------------------------------------------------- -class SysExecEvent_Execute : public SysExecEvent -{ -protected: - bool m_UseCDVDsrc; - bool m_UseELFOverride; - CDVD_SourceType m_cdvdsrc_type; - wxString m_elf_override; - -public: - virtual ~SysExecEvent_Execute() = default; - SysExecEvent_Execute* Clone() const { return new SysExecEvent_Execute(*this); } - - wxString GetEventName() const - { - return L"SysExecute"; - } - - wxString GetEventMessage() const - { - return _("Executing PS2 Virtual Machine..."); - } - - SysExecEvent_Execute() - : m_UseCDVDsrc(false) - , m_UseELFOverride(false) - , m_cdvdsrc_type(CDVD_SourceType::Iso) - { - } - - SysExecEvent_Execute( CDVD_SourceType srctype, const wxString& elf_override ) - : m_UseCDVDsrc(true) - , m_UseELFOverride(true) - , m_cdvdsrc_type(srctype) - , m_elf_override( elf_override ) - { - } - -protected: - void InvokeEvent() - { - wxGetApp().ProcessMethod( AppSaveSettings ); - - DbgCon.WriteLn( Color_Gray, "(SysExecute) received." ); - - CoreThread.ResetQuick(); - R5900SymbolMap.Clear(); - R3000SymbolMap.Clear(); - CBreakPoints::SetSkipFirst(BREAKPOINT_EE, 0); - CBreakPoints::SetSkipFirst(BREAKPOINT_IOP, 0); - // This function below gets called again from AppCoreThread.cpp and will pass the current ISO regardless if we - // are starting an ELF. In terms of symbol loading this doesn't matter because AppCoreThread.cpp doesn't clear the symbol map - // and we _only_ read symbols if the map is empty - CDVDsys_SetFile(CDVD_SourceType::Disc, StringUtil::wxStringToUTF8String(g_Conf->Folders.RunDisc) ); - CDVDsys_SetFile(CDVD_SourceType::Iso, StringUtil::wxStringToUTF8String(m_UseELFOverride ? m_elf_override : g_Conf->CurrentIso) ); - if( m_UseCDVDsrc ) - CDVDsys_ChangeSource( m_cdvdsrc_type ); - else if( CDVD == NULL ) - CDVDsys_ChangeSource(CDVD_SourceType::NoDisc); - - if( m_UseELFOverride && !CoreThread.HasActiveMachine() ) - CoreThread.SetElfOverride( m_elf_override ); - - CoreThread.Resume(); - } -}; - -// This command performs a full closure of any existing VM state and starts a -// fresh VM with the requested sources. -void Pcsx2App::SysExecute() -{ - if (!CheckForBIOS()) - return; - - SysExecutorThread.PostEvent( new SysExecEvent_Execute() ); -} - -// Executes the specified cdvd source and optional elf file. This command performs a -// full closure of any existing VM state and starts a fresh VM with the requested -// sources. -void Pcsx2App::SysExecute( CDVD_SourceType cdvdsrc, const wxString& elf_override ) -{ - if (!CheckForBIOS()) - return; - - SysExecutorThread.PostEvent( new SysExecEvent_Execute(cdvdsrc, elf_override) ); -} - -// Returns true if there is a "valid" virtual machine state from the user's perspective. This -// means the user has started the emulator and not issued a full reset. -// Thread Safety: The state of the system can change in parallel to execution of the -// main thread. If you need to perform an extended length activity on the execution -// state (such as saving it), you *must* suspend the Corethread first! -__fi bool SysHasValidState() -{ - return CoreThread.HasActiveMachine(); -} - -// Writes text to console and updates the window status bar and/or HUD or whateverness. -// FIXME: This probably isn't thread safe. >_< -void SysStatus( const wxString& text ) -{ - // mirror output to the console! - Console.WriteLn( text.ToStdString() ); - sMainFrame.SetStatusText( text ); -} - -// Applies a new active iso source file -void SysUpdateIsoSrcFile( const wxString& newIsoFile ) -{ - g_Conf->CurrentIso = newIsoFile; - sMainFrame.UpdateStatusBar(); - sMainFrame.UpdateCdvdSrcSelection(); -} - -void SysUpdateDiscSrcDrive( const wxString& newDiscDrive ) -{ - g_Conf->Folders.RunDisc = newDiscDrive; - AppSaveSettings(); - sMainFrame.UpdateCdvdSrcSelection(); -} - -bool HasMainFrame() -{ - return wxTheApp && wxGetApp().HasMainFrame(); -} - -// This method generates debug assertions if either the wxApp or MainFrame handles are -// NULL (typically indicating that PCSX2 is running in NoGUI mode, or that the main -// frame has been closed). In most cases you'll want to use HasMainFrame() to test -// for gui validity first, or use GetMainFramePtr() and manually check for NULL (choice -// is a matter of programmer preference). -MainEmuFrame& GetMainFrame() -{ - return wxGetApp().GetMainFrame(); -} - -// Returns a pointer to the main frame of the GUI (frame may be hidden from view), or -// NULL if no main frame exists (NoGUI mode and/or the frame has been destroyed). If -// the wxApp is NULL then this will also return NULL. -MainEmuFrame* GetMainFramePtr() -{ - return wxTheApp ? wxGetApp().GetMainFramePtr() : NULL; -} - -SysMainMemory& GetVmMemory() -{ - return wxGetApp().GetVmReserve(); -} - -SysCpuProviderPack& GetCpuProviders() -{ - return *wxGetApp().m_CpuProviders; -} diff --git a/pcsx2/gui/AppRes.cpp b/pcsx2/gui/AppRes.cpp deleted file mode 100644 index abe10df6cf..0000000000 --- a/pcsx2/gui/AppRes.cpp +++ /dev/null @@ -1,180 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "MainFrame.h" - -#include -#include -#include -#include - -#include "MSWstuff.h" - -#include "gui/EmbeddedImage.h" -#include "gui/Resources/BackgroundLogo.h" -#include "gui/Resources/ButtonIcon_Camera.h" - -#include "gui/Resources/ConfigIcon_Cpu.h" -#include "gui/Resources/ConfigIcon_Video.h" -#include "gui/Resources/ConfigIcon_Speedhacks.h" -#include "gui/Resources/ConfigIcon_Gamefixes.h" -#include "gui/Resources/ConfigIcon_Paths.h" -#include "gui/Resources/ConfigIcon_MemoryCard.h" - -#include "gui/Resources/AppIcon16.h" -#include "gui/Resources/AppIcon32.h" -#include "gui/Resources/AppIcon64.h" - -RecentIsoList::RecentIsoList(int firstIdForMenuItems_or_wxID_ANY) - : Menu(std::unique_ptr(new wxMenu())) -{ - Menu->Append(MenuId_IsoBrowse, _("Browse..."), _("Browse for an ISO that is not in your recent history.")); - Menu->AppendSeparator(); - Menu->AppendCheckItem(MenuId_Ask_On_Booting, _("Always ask when booting"), _("Manually select an ISO upon boot ignoring the selection from recent ISO list.")); - Menu->Check(MenuId_Ask_On_Booting, g_Conf->AskOnBoot); - - Manager = std::unique_ptr(new RecentIsoManager(Menu.get(), firstIdForMenuItems_or_wxID_ANY)); -} - -pxAppResources::pxAppResources() -{ -} - -pxAppResources::~pxAppResources() = default; - -wxMenu& Pcsx2App::GetRecentIsoMenu() -{ - if (!m_RecentIsoList) - m_RecentIsoList = std::unique_ptr(new RecentIsoList(MenuId_RecentIsos_reservedStart)); - return *m_RecentIsoList->Menu; -} - -RecentIsoManager& Pcsx2App::GetRecentIsoManager() -{ - if (!m_RecentIsoList) - m_RecentIsoList = std::unique_ptr(new RecentIsoList(MenuId_RecentIsos_reservedStart)); - return *m_RecentIsoList->Manager; -} - -wxMenu& Pcsx2App::GetDriveListMenu() -{ - if (!m_DriveList) - { - m_DriveList = std::unique_ptr(new DriveList()); - } - - return *m_DriveList->Menu; -} - -pxAppResources& Pcsx2App::GetResourceCache() -{ - ScopedLock lock(m_mtx_Resources); - if (!m_Resources) - m_Resources = std::unique_ptr(new pxAppResources()); - - return *m_Resources; -} - -const wxIconBundle& Pcsx2App::GetIconBundle() -{ - std::unique_ptr& bundle(GetResourceCache().IconBundle); - if (!bundle) - { - bundle = std::unique_ptr(new wxIconBundle()); - bundle->AddIcon(EmbeddedImage().GetIcon()); - bundle->AddIcon(EmbeddedImage().GetIcon()); - bundle->AddIcon(EmbeddedImage().GetIcon()); - } - - return *bundle; -} - -const wxBitmap& Pcsx2App::GetLogoBitmap() -{ - std::unique_ptr& logo(GetResourceCache().Bitmap_Logo); - if (logo) - return *logo; - - wxImage img = EmbeddedImage().Get(); - float scale = MSW_GetDPIScale(); // 1.0 for non-Windows - logo = std::unique_ptr(new wxBitmap(img.Scale(img.GetWidth() * scale, img.GetHeight() * scale, wxIMAGE_QUALITY_HIGH))); - - return *logo; -} - -const wxBitmap& Pcsx2App::GetScreenshotBitmap() -{ - std::unique_ptr& screenshot(GetResourceCache().ScreenshotBitmap); - if (screenshot) - return *screenshot; - - wxImage img = EmbeddedImage().Get(); - float scale = MSW_GetDPIScale(); // 1.0 for non-Windows - screenshot = std::unique_ptr(new wxBitmap(img.Scale(img.GetWidth() * scale, img.GetHeight() * scale, wxIMAGE_QUALITY_HIGH))); - - return *screenshot; -} - -wxImageList& Pcsx2App::GetImgList_Config() -{ - std::unique_ptr& images(GetResourceCache().ConfigImages); - if (!images) - { - int image_size = MSW_GetDPIScale() * g_Conf->Listbook_ImageSize; - images = std::unique_ptr(new wxImageList(image_size, image_size)); - -#undef FancyLoadMacro -#define FancyLoadMacro(name) \ - { \ - wxImage img = EmbeddedImage().Get(); \ - img.Rescale(image_size, image_size, wxIMAGE_QUALITY_HIGH); \ - m_Resources->ImageId.Config.name = images->Add(img); \ - } - - FancyLoadMacro(Paths); - FancyLoadMacro(Gamefixes); - FancyLoadMacro(Speedhacks); - FancyLoadMacro(MemoryCard); - FancyLoadMacro(Video); - FancyLoadMacro(Cpu); - } - return *images; -} - -// This stuff seems unused? -wxImageList& Pcsx2App::GetImgList_Toolbars() -{ - std::unique_ptr& images(GetResourceCache().ToolbarImages); - - if (!images) - { - const int imgSize = g_Conf->Toolbar_ImageSize ? 64 : 32; - images = std::unique_ptr(new wxImageList(imgSize, imgSize)); - -#undef FancyLoadMacro -#define FancyLoadMacro(name) \ - { \ - wxImage img = EmbeddedImage(imgSize, imgSize).Get(); \ - m_Resources.ImageId.Toolbars.name = images->Add(img); \ - } - } - return *images; -} - -const AppImageIds& Pcsx2App::GetImgId() const -{ - return m_Resources->ImageId; -} diff --git a/pcsx2/gui/AppSaveStates.h b/pcsx2/gui/AppSaveStates.h deleted file mode 100644 index 361b564ea6..0000000000 --- a/pcsx2/gui/AppSaveStates.h +++ /dev/null @@ -1,25 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "App.h" -#include "SaveState.h" -#include "Saveslots.h" - -extern void StateCopy_SaveToFile(const wxString& file); -extern void StateCopy_LoadFromFile(const wxString& file); -extern void StateCopy_SaveToSlot(uint num); -extern void StateCopy_LoadFromSlot(uint slot, bool isFromBackup = false); diff --git a/pcsx2/gui/AppTrait.h b/pcsx2/gui/AppTrait.h deleted file mode 100644 index 2d837449b8..0000000000 --- a/pcsx2/gui/AppTrait.h +++ /dev/null @@ -1,39 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - -// -------------------------------------------------------------------------------------- -// Pcsx2AppTraits -// -------------------------------------------------------------------------------------- -// Overrides and customizes some default wxWidgets behaviors. This class is instanized by -// calls to Pcsx2App::CreateTraits(), which is called from wxWidgets as-needed. wxWidgets -// does cache an instance of the traits, so the object construction need not be trivial -// (translation: it can be complicated-ish -- it won't affect performance). -// -class Pcsx2AppTraits : public wxGUIAppTraits -{ - typedef wxGUIAppTraits _parent; - -public: - virtual ~Pcsx2AppTraits() {} - wxMessageOutput* CreateMessageOutput(); - -#ifdef wxUSE_STDPATHS - wxStandardPaths& GetStandardPaths(); -#endif -}; diff --git a/pcsx2/gui/AppUserMode.cpp b/pcsx2/gui/AppUserMode.cpp deleted file mode 100644 index 5084df229e..0000000000 --- a/pcsx2/gui/AppUserMode.cpp +++ /dev/null @@ -1,301 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "MainFrame.h" -#include "gui/IniInterface.h" -#include "Dialogs/ModalPopups.h" - -#include - -#ifdef __WXMSW__ -#include "wx/msw/regconf.h" -#endif - -DocsModeType DocsFolderMode = DocsFolder_User; -bool UseDefaultSettingsFolder = true; - - -wxDirName CustomDocumentsFolder; -wxDirName SettingsFolder; - -wxDirName InstallFolder; - -// The UserLocalData folder can be redefined depending on whether or not PCSX2 is in -// "portable install" mode or not. when PCSX2 has been configured for portable install, the -// UserLocalData folder is the current working directory. -// -InstallationModeType InstallationMode; - -static wxFileName GetPortableIniPath() -{ - wxString programFullPath = wxStandardPaths::Get().GetExecutablePath(); - wxDirName programDir( wxFileName(programFullPath).GetPath() ); - - return programDir + "portable.ini"; -} - -static wxString GetMsg_PortableModeRights() -{ - return pxE( L"Please ensure that these folders are created and that your user account is granted write permissions to them -- or re-run PCSX2 with elevated (administrator) rights, which should grant PCSX2 the ability to create the necessary folders itself. If you do not have elevated rights on this computer, then you will need to switch to User Documents mode (click button below)." - ); -}; - -bool Pcsx2App::TestUserPermissionsRights( const wxDirName& testFolder, wxString& createFailedStr, wxString& accessFailedStr ) -{ - // We need to individually verify read/write permission for each PCSX2 user documents folder. - // If any of the folders are not writable, then the user should be informed asap via - // friendly and courteous dialog box! - - const wxDirName PermissionFolders[] = - { - PathDefs::Base::Settings(), - PathDefs::Base::MemoryCards(), - PathDefs::Base::Savestates(), - PathDefs::Base::Snapshots(), - PathDefs::Base::Logs(), - PathDefs::Base::CheatsWS(), - #ifdef PCSX2_DEVBUILD - PathDefs::Base::Dumps(), - #endif - }; - - FastFormatUnicode createme, accessme; - - for (uint i=0; i conf_portable( OpenFileConfig( portableIniFile.GetFullPath() ) ); - conf_portable->SetRecordDefaults(false); - - while( true ) - { - wxString accessFailedStr, createFailedStr; - if (TestUserPermissionsRights( portableDocsFolder, createFailedStr, accessFailedStr )) break; - - wxDialogWithHelpers dialog( NULL, AddAppName(_("Portable mode error - %s")) ); - - wxTextCtrl* scrollText = new wxTextCtrl( - &dialog, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxTE_READONLY | wxTE_MULTILINE | wxTE_WORDWRAP - ); - - if (!createFailedStr.IsEmpty()) - scrollText->AppendText( createFailedStr + L"\n" ); - - if (!accessFailedStr.IsEmpty()) - scrollText->AppendText( accessFailedStr + L"\n" ); - - dialog += dialog.Heading( _("PCSX2 has been installed as a portable application but cannot run due to the following errors:" ) ); - dialog += scrollText | pxExpand.Border(wxALL, 16); - dialog += 6; - dialog += dialog.Text( GetMsg_PortableModeRights() ); - - // [TODO] : Add url for platform-relevant user permissions tutorials? (low priority) - - wxWindowID result = pxIssueConfirmation( dialog, - MsgButtons().Retry().Cancel().Custom(_("Switch to User Documents Mode"), "switchmode") - ); - - switch (result) - { - case wxID_CANCEL: - throw Exception::StartupAborted( "User canceled portable mode due to insufficient user access/permissions." ); - - case wxID_RETRY: - // do nothing (continues while loop) - break; - - case pxID_CUSTOM: - wxDialogWithHelpers dialog2( NULL, AddAppName(_("%s is switching to local install mode.")) ); - dialog2 += dialog2.Heading( _("Try to remove the file called \"portable.ini\" from your installation directory manually." ) ); - dialog2 += 6; - pxIssueConfirmation( dialog2, MsgButtons().OK() ); - - return NULL; - } - - } - - // Success -- all user-based folders have write access. PCSX2 should be able to run error-free! - // Force-set the custom documents mode, and set the - - InstallationMode = InstallMode_Portable; - DocsFolderMode = DocsFolder_Custom; - CustomDocumentsFolder = portableDocsFolder; - return conf_portable.release(); - } - - return NULL; -} - -// Reset RunWizard so the FTWizard is run again on next PCSX2 start. -void Pcsx2App::WipeUserModeSettings() -{ - if (InstallationMode == InstallMode_Portable) - { - // Remove the portable.ini entry "RunWizard" conforming to this instance of PCSX2. - wxFileName portableIniFile( GetPortableIniPath() ); - std::unique_ptr conf_portable( OpenFileConfig( portableIniFile.GetFullPath() ) ); - conf_portable->DeleteEntry(L"RunWizard"); - } - else - { - // Remove the registry entry "RunWizard" conforming to this instance of PCSX2. - std::unique_ptr conf_install( OpenInstallSettingsFile() ); - conf_install->DeleteEntry(L"RunWizard"); - } -} - -static void DoFirstTimeWizard() -{ - // first time startup, so give the user the choice of user mode: - while(true) - { - // PCSX2's FTWizard allows improptu restarting of the wizard without cancellation. - // This is typically used to change the user's language selection. - - FirstTimeWizard wiz( NULL ); - if( wiz.RunWizard( wiz.GetFirstPage() ) ) break; - if (wiz.GetReturnCode() != pxID_RestartWizard) - throw Exception::StartupAborted( "User canceled FirstTime Wizard." ); - - Console.WriteLn( Color_StrongBlack, "Restarting First Time Wizard!" ); - } -} - -wxConfigBase* Pcsx2App::OpenInstallSettingsFile() -{ - std::unique_ptr conf_install; - -#ifdef __WXMSW__ - conf_install = std::unique_ptr(new wxRegConfig()); -#else - // FIXME!! Linux / Mac - // Where the heck should this information be stored? - - wxDirName usrlocaldir( PathDefs::GetUserLocalDataDir() ); - //wxDirName usrlocaldir( wxStandardPaths::Get().GetDataDir() ); - if( !usrlocaldir.Exists() ) - { - Console.WriteLn( L"Creating UserLocalData folder: " + usrlocaldir.ToString() ); - usrlocaldir.Mkdir(); - } - - wxFileName usermodefile( GetAppName() + L"-reg.ini" ); - usermodefile.SetPath( usrlocaldir.ToString() ); - conf_install = std::unique_ptr(OpenFileConfig( usermodefile.GetFullPath() )); -#endif - - return conf_install.release(); -} - - -void Pcsx2App::ForceFirstTimeWizardOnNextRun() -{ - std::unique_ptr conf_install; - - conf_install = std::unique_ptr(TestForPortableInstall()); - if (!conf_install) - conf_install = std::unique_ptr(OpenInstallSettingsFile()); - - conf_install->Write( L"RunWizard", true ); -} - -void Pcsx2App::EstablishAppUserMode() -{ - std::unique_ptr conf_install; - - conf_install = std::unique_ptr(TestForPortableInstall()); - if (!conf_install) - conf_install = std::unique_ptr(OpenInstallSettingsFile()); - - conf_install->SetRecordDefaults(false); - - // Run the First Time Wizard! - // ---------------------------- - // Wizard is only run once. The status of the wizard having been run is stored in - // the installation ini file, which can be either the portable install (useful for admins) - // or the registry/user local documents position. - - bool runWiz; - conf_install->Read( L"RunWizard", &runWiz, true ); - - App_LoadInstallSettings( conf_install.get() ); - - if( !Startup.ForceWizard && !runWiz ) - { - AppConfig_OnChangedSettingsFolder( false ); - return; - } - - DoFirstTimeWizard(); - - // Save user's new settings - App_SaveInstallSettings( conf_install.get() ); - AppConfig_OnChangedSettingsFolder( true ); - AppSaveSettings(); - - // Wizard completed successfully, so let's not torture the user with this crap again! - conf_install->Write( L"RunWizard", false ); -} - diff --git a/pcsx2/gui/ApplyState.h b/pcsx2/gui/ApplyState.h deleted file mode 100644 index ea8bb7e286..0000000000 --- a/pcsx2/gui/ApplyState.h +++ /dev/null @@ -1,243 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include - -#include "AppCommon.h" - -class BaseApplicableConfigPanel; -class BaseApplicableDialog; - -wxDECLARE_EVENT(pxEvt_ApplySettings, wxCommandEvent); - -namespace Exception -{ - // -------------------------------------------------------------------------- - // Exception used to perform an abort of Apply/Ok action on settings panels. - // When thrown, the user receives a popup message containing the information - // specified in the exception message, and is returned to the settings dialog - // to correct the invalid input fields. - // - class CannotApplySettings : public BaseException - { - DEFINE_EXCEPTION_COPYTORS( CannotApplySettings, BaseException ) - DEFINE_EXCEPTION_MESSAGES( CannotApplySettings ) - - public: - bool IsVerbose; - - protected: - BaseApplicableConfigPanel* m_Panel; - - protected: - CannotApplySettings() { IsVerbose = true; } - - public: - explicit CannotApplySettings( BaseApplicableConfigPanel* thispanel ) - { - SetBothMsgs("Cannot apply new settings, one of the settings is invalid."); - m_Panel = thispanel; - IsVerbose = true; - } - - virtual CannotApplySettings& Quiet() { IsVerbose = false; return *this; } - BaseApplicableConfigPanel* GetPanel() { return m_Panel; } - }; -} - -typedef std::list PanelApplyList_t; - -struct ApplyStateStruct -{ - // collection of ApplicableConfigPanels that belong to a dialog box. - PanelApplyList_t PanelList; - - // Current book page being initialized. Any apply objects created will use - // this page as their "go here on error" page. (used to take the user to the - // page with the option that failed apply validation). - int CurOwnerPage; - - // TODO : Rename me to CurOwnerBook, or rename the one above to ParentPage. - wxBookCtrlBase* ParentBook; - - ApplyStateStruct() - { - CurOwnerPage = wxID_NONE; - ParentBook = NULL; - } - - void SetCurrentPage( int page ) - { - CurOwnerPage = page; - } - - void ClearCurrentPage() - { - CurOwnerPage = wxID_NONE; - } - - void StartBook( wxBookCtrlBase* book ); - void StartWizard(); - bool ApplyAll(); - bool ApplyPage( int pageid ); - void DoCleanup() noexcept; -}; - -class IApplyState -{ -protected: - ApplyStateStruct m_ApplyState; - -public: - virtual ApplyStateStruct& GetApplyState() { return m_ApplyState; } -}; - -// -------------------------------------------------------------------------------------- -// BaseApplicableDialog -// -------------------------------------------------------------------------------------- -class BaseApplicableDialog - : public wxDialogWithHelpers - , public IApplyState -{ - wxDECLARE_DYNAMIC_CLASS_NO_COPY(BaseApplicableDialog); - -public: - BaseApplicableDialog() {} - virtual ~BaseApplicableDialog(); - - // Must return the same thing as GetNameStatic; a name ideal for use in uniquely - // identifying dialogs. (this version is the 'instance' version, which is called - // by BaseConfigurationDialog to assign the wxWidgets dialog name, and for saving - // screenshots to disk) - virtual wxString GetDialogName() const; - -protected: - void Init(); - - BaseApplicableDialog(wxWindow* parent, const wxString& title, const pxDialogCreationFlags& cflags = pxDialogCreationFlags() ); - - virtual void OnSettingsApplied( wxCommandEvent& evt ); - - // Note: This method *will* be called automatically after a successful Apply, but will not - // be called after a failed Apply (canceled due to error). - virtual void AppStatusEvent_OnSettingsApplied() {} - - virtual void AppStatusEvent_OnUiSettingsLoadSave( const AppSettingsEventInfo& ) {} - virtual void AppStatusEvent_OnExit() {} -}; - -// -------------------------------------------------------------------------------------- -// BaseApplicableConfigPanel -// -------------------------------------------------------------------------------------- -// Extends the Panel class to add an Apply() method, which is invoked from the parent -// window (usually the ConfigurationDialog) when either Ok or Apply is clicked. -// -// Thread Safety: None. This class is only safe when used from the GUI thread, as it uses -// static vars and assumes that only one ApplicableConfig system is available to the -// user at any time (ie, a singular modal dialog). -// -class BaseApplicableConfigPanel - : public wxPanelWithHelpers -{ -protected: - int m_OwnerPage; - wxBookCtrlBase* m_OwnerBook; - - EventListenerHelper_AppStatus m_AppStatusHelper; - -public: - virtual ~BaseApplicableConfigPanel(); - - BaseApplicableConfigPanel( wxWindow* parent, wxOrientation orient=wxVERTICAL ); - BaseApplicableConfigPanel( wxWindow* parent, wxOrientation orient, const wxString& staticLabel ); - - int GetOwnerPage() const { return m_OwnerPage; } - wxBookCtrlBase* GetOwnerBook() { return m_OwnerBook; } - - void SetFocusToMe(); - IApplyState* FindApplyStateManager() const; - - // Returns true if this ConfigPanel belongs to the specified page. Useful for doing - // selective application of options for specific pages. - bool IsOnPage( int pageid ) { return m_OwnerPage == pageid; } - - // This method attempts to assign the settings for the panel into the given - // configuration structure (which is typically a copy of g_Conf). If validation - // of form contents fails, the function should throw Exception::CannotApplySettings. - // If no exceptions are thrown, then the operation is assumed a success. :) - virtual void Apply()=0; - - //Enable the apply button manually if required (in case the auto-trigger doesn't kick in, e.g. when clicking a button) - void SomethingChanged(); - - - void Init(); - - // Mandatory override: As a rule for proper interface design, all deriving classes need - // to implement this OnSettingsApplied function. There's no implementation of an options/ - // settings panel that does not heed the changes of application status/settings changes. ;) - // - // Note: This method *will* be called automatically after a successful Apply, but will not - // be called after a failed Apply (canceled due to error). - virtual void AppStatusEvent_OnSettingsApplied()=0; - - virtual void AppStatusEvent_OnUiSettingsLoadSave( const AppSettingsEventInfo& ) {} - virtual void AppStatusEvent_OnVmSettingsLoadSave( const AppSettingsEventInfo& ) {} - virtual void AppStatusEvent_OnExit() {} - - virtual bool IsSpecificConfig(){return false;} //lame RTTI - -protected: - virtual void OnSettingsApplied( wxCommandEvent& evt ); -}; - -class BaseApplicableConfigPanel_SpecificConfig : public BaseApplicableConfigPanel -{ - //This class only differs from BaseApplicableConfigPanel by systematically allowing the gui to be updated - //from a specific config (used by the presets system to trash not g_Conf in case the user pressed "Cancel"). - //Every panel that the Presets affect should be derived from this and not from BaseApplicableConfigPanel. - // - //Multiple inheritance would have been better (also for cases of non BaseApplicableConfigPanel which are effected by presets), - //but multiple inheritance sucks. So, subclass. - //NOTE: because ApplyConfigToGui is called manually and not via an event, it must consider manuallyPropagate and call sub panels. -public: - virtual bool IsSpecificConfig(){return true;}; - BaseApplicableConfigPanel_SpecificConfig( wxWindow* parent, wxOrientation orient=wxVERTICAL ); - BaseApplicableConfigPanel_SpecificConfig( wxWindow* parent, wxOrientation orient, const wxString& staticLabel ); - - //possible flags are: AppConfig: APPLY_FLAG_MANUALLY_PROPAGATE and APPLY_FLAG_IS_FROM_PRESET - virtual void ApplyConfigToGui(AppConfig& configToApply, int flags=0) = 0; -}; - -class ApplicableWizardPage : public wxWizardPageSimple, public IApplyState -{ - wxDECLARE_DYNAMIC_CLASS_NO_COPY(ApplicableWizardPage); - -public: - ApplicableWizardPage( - wxWizard* parent=NULL, - wxWizardPage *prev = NULL, - wxWizardPage *next = NULL, - const wxBitmap& bitmap = wxNullBitmap - ); - - virtual ~ApplicableWizardPage() { m_ApplyState.DoCleanup(); } - - virtual bool PrepForApply(); -}; - diff --git a/pcsx2/gui/CheckedStaticBox.cpp b/pcsx2/gui/CheckedStaticBox.cpp deleted file mode 100644 index d2d707c8a5..0000000000 --- a/pcsx2/gui/CheckedStaticBox.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/CheckedStaticBox.h" - -CheckedStaticBox::CheckedStaticBox(wxWindow* parent, int orientation, const wxString& title) - : wxPanelWithHelpers(parent, wxVERTICAL) - , ThisSizer(*new wxStaticBoxSizer(orientation, this)) - , ThisToggle(*new wxCheckBox(this, wxID_ANY, title, wxPoint(8, 0))) -{ - *this += ThisToggle; - *this += ThisSizer | pxExpand; - - // Ensure that the right-side of the static group box isn't too cozy: - SetMinWidth(ThisToggle.GetSize().GetWidth() + 32); - - Bind(wxEVT_CHECKBOX, &CheckedStaticBox::MainToggle_Click, this, ThisToggle.GetId()); -} - -// Event handler for click events for the main checkbox (default behavior: enables/disables all child controls) -// This function can be overridden to implement custom handling of check enable/disable behavior. -void CheckedStaticBox::MainToggle_Click(wxCommandEvent& evt) -{ - SetValue(evt.IsChecked()); - evt.Skip(); -} - -// Sets the main checkbox status, and enables/disables all child controls -// bound to the StaticBox accordingly. -void CheckedStaticBox::SetValue(bool val) -{ - wxWindowList& list = GetChildren(); - - for (wxWindowList::iterator iter = list.begin(); iter != list.end(); ++iter) - { - wxWindow* current = *iter; - if (current != &ThisToggle) - current->Enable(IsEnabled() && val); - } - ThisToggle.SetValue(val); -} - -bool CheckedStaticBox::GetValue() const -{ - return ThisToggle.GetValue(); -} - -// This override is here so to only enable the children if both the main toggle and -// the enable request are true. If not, disable them! -bool CheckedStaticBox::Enable(bool enable) -{ - if (!_parent::Enable(enable)) - return false; - - bool val = enable && ThisToggle.GetValue(); - wxWindowList& list = GetChildren(); - - for (wxWindowList::iterator iter = list.begin(); iter != list.end(); ++iter) - { - wxWindow* current = *iter; - if (current != &ThisToggle) - current->Enable(val); - } - - return true; -} diff --git a/pcsx2/gui/CheckedStaticBox.h b/pcsx2/gui/CheckedStaticBox.h deleted file mode 100644 index 2fa3a14a64..0000000000 --- a/pcsx2/gui/CheckedStaticBox.h +++ /dev/null @@ -1,37 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "gui/wxGuiTools.h" - -class CheckedStaticBox : public wxPanelWithHelpers -{ - typedef wxPanelWithHelpers _parent; - -public: - wxBoxSizer& ThisSizer; // Boxsizer which holds all child items. - wxCheckBox& ThisToggle; // toggle which can enable/disable all child controls - -public: - CheckedStaticBox(wxWindow* parent, int orientation, const wxString& title = wxEmptyString); - - void SetValue(bool val); - bool GetValue() const; - bool Enable(bool enable = true); - -public: - virtual void MainToggle_Click(wxCommandEvent& evt); -}; diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp deleted file mode 100644 index 93ad6050d0..0000000000 --- a/pcsx2/gui/ConsoleLogger.cpp +++ /dev/null @@ -1,1281 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "MainFrame.h" -#include "ConsoleLogger.h" -#include "MSWstuff.h" -#include "Host.h" -#include "IniInterface.h" - -#include "common/Console.h" -#include "common/SafeArray.inl" -#include "Dialogs/LogOptionsDialog.h" -#include "DebugTools/Debug.h" -#include - -wxDECLARE_EVENT(pxEvt_SetTitleText, wxCommandEvent); -wxDECLARE_EVENT(pxEvt_FlushQueue, wxCommandEvent); - -wxDEFINE_EVENT(pxEvt_SetTitleText, wxCommandEvent); -wxDEFINE_EVENT(pxEvt_FlushQueue, wxCommandEvent); - -// C++ requires abstract destructors to exist, even though they're abstract. -PipeRedirectionBase::~PipeRedirectionBase() = default; - -// Writes text to the Visual Studio Output window (Microsoft Windows only). -// On all other platforms this pipes to Stdout instead. -void MSW_OutputDebugString(const wxString& text) -{ -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) - static bool hasDebugger = wxIsDebuggerRunning(); - if (hasDebugger) - OutputDebugString(text); -#else - fputs(text.utf8_str(), stdout); - fflush(stdout); -#endif -} - -// ---------------------------------------------------------------------------- -// -void pxLogConsole::DoLogRecord(wxLogLevel level, const wxString &message, const wxLogRecordInfo &info) -{ - switch ( level ) - { - case wxLOG_Trace: - case wxLOG_Debug: - { - wxString str; - TimeStamp( &str ); - MSW_OutputDebugString( str + message + L"\n" ); - } - break; - - case wxLOG_FatalError: - // This one is unused by wx, and unused by PCSX2 (we prefer exceptions, thanks). - pxFailDev( "Stop using FatalError and use assertions or exceptions instead." ); - break; - - case wxLOG_Status: - // Also unsed by wx, and unused by PCSX2 also (we prefer direct API calls to our main window!) - pxFailDev( "Stop using wxLogStatus just access the Pcsx2App functions directly instead." ); - break; - - case wxLOG_Info: - if ( !GetVerbose() ) return; - // fallthrough! - - case wxLOG_Message: - Console.WriteLn( "[wx] %ls", WX_STR(message)); - break; - - case wxLOG_Error: - Console.Error("[wx] %ls", WX_STR(message)); - break; - - case wxLOG_Warning: - Console.Warning("[wx] %ls", WX_STR(message)); - break; - } -} - - -// ---------------------------------------------------------------------------- -void ConsoleTestThread::ExecuteTaskInThread() -{ - static int numtrack = 0; - - while( !m_done ) - { - // Two lines, both formatted, and varied colors. This makes for a fairly realistic - // worst case scenario (without being entirely unrealistic). - Console.WriteLn( "This is a threaded logging test. Something bad could happen... %d", ++numtrack ); - Console.Warning( "Testing high stress loads %s", "(multi-color)" ); - Yield( 0 ); - } -} - -// ---------------------------------------------------------------------------- -// Pass an uninitialized file object. The function will ask the user for the -// filename and try to open it. It returns true on success (file was opened), -// false if file couldn't be opened/created and -1 if the file selection -// dialog was canceled. -// -static bool OpenLogFile(wxFile& file, wxString& filename, wxWindow *parent) -{ - filename = wxSaveFileSelector(L"log", L"txt", L"log.txt", parent); - if ( !filename ) return false; // canceled - - if( wxFile::Exists(filename) ) - { - bool bAppend = false; - wxString strMsg; - strMsg.Printf(L"Append log to file '%s' (choosing [No] will overwrite it)?", - filename.c_str()); - - switch ( Msgbox::ShowModal( _("Save log question."), strMsg, MsgButtons().YesNo().Cancel() ) ) - { - case wxID_YES: - bAppend = true; - break; - - case wxID_NO: - bAppend = false; - break; - - case wxID_CANCEL: - return false; - - default: - pxFailDev( "Invalid message box return value." ); - } - - return ( bAppend ) ? - file.Open(filename, wxFile::write_append) : - file.Create(filename, true /* overwrite */); - } - - return file.Create(filename); -} - -// -------------------------------------------------------------------------------------- -// ConsoleLogFrame::ColorArray (implementations) -// -------------------------------------------------------------------------------------- - -// fontsize - size of the font specified in points. -// (actual font used is the system-selected fixed-width font) -// -ConsoleLogFrame::ColorArray::ColorArray( int fontsize ) -{ - SetFont( fontsize ); -} - -void ConsoleLogFrame::ColorArray::SetFont( int fontsize ) -{ - const wxFont fixed( pxGetFixedFont( fontsize ) ); - const wxFont fixedB( pxGetFixedFont( fontsize+1, wxFONTWEIGHT_BOLD ) ); - - // Standard R, G, B format: - for (size_t i = 0; i < Color_StrongBlack; ++i) - m_table[i].SetFont(fixed); - - for (size_t i = Color_StrongBlack; i < ConsoleColors_Count; ++i) - m_table[i].SetFont(fixedB); -} - -void ConsoleLogFrame::ColorArray::SetColorScheme_Dark() -{ - m_table[Color_Default] .SetTextColour(wxColor( 208, 208, 208 )); - m_table[Color_Black] .SetTextColour(wxColor( 255, 255, 255 )); - m_table[Color_Red] .SetTextColour(wxColor( 255, 87, 87 )); - m_table[Color_Green] .SetTextColour(wxColor( 58, 194, 121 )); - m_table[Color_Blue] .SetTextColour(wxColor( 14, 105, 230 )); - m_table[Color_Magenta] .SetTextColour(wxColor( 160, 0, 160 )); - m_table[Color_Orange] .SetTextColour(wxColor( 160, 120, 0 )); - m_table[Color_Gray] .SetTextColour(wxColor( 128, 128, 128 )); - - m_table[Color_Cyan] .SetTextColour(wxColor( 128, 180, 180 )); - m_table[Color_Yellow] .SetTextColour(wxColor( 194, 194, 72 )); - m_table[Color_White] .SetTextColour(wxColor( 160, 160, 160 )); - - m_table[Color_StrongBlack] .SetTextColour(wxColor( 255, 255, 255 )); - m_table[Color_StrongRed] .SetTextColour(wxColor( 230, 23, 23 )); - m_table[Color_StrongGreen] .SetTextColour(wxColor( 4, 185, 4 )); - m_table[Color_StrongBlue] .SetTextColour(wxColor( 63, 173, 232 )); - m_table[Color_StrongMagenta].SetTextColour(wxColor( 160, 0, 160 )); - m_table[Color_StrongOrange] .SetTextColour(wxColor( 160, 120, 0 )); - m_table[Color_StrongGray] .SetTextColour(wxColor( 128, 128, 128 )); - - m_table[Color_StrongCyan] .SetTextColour(wxColor( 128, 180, 180 )); - m_table[Color_StrongYellow] .SetTextColour(wxColor( 194, 194, 72 )); - m_table[Color_StrongWhite] .SetTextColour(wxColor( 160, 160, 160 )); -} - -void ConsoleLogFrame::ColorArray::SetColorScheme_Light() -{ - m_table[Color_Default] .SetTextColour(wxColor( 0, 0, 0 )); - m_table[Color_Black] .SetTextColour(wxColor( 0, 0, 0 )); - m_table[Color_Red] .SetTextColour(wxColor( 128, 0, 0 )); - m_table[Color_Green] .SetTextColour(wxColor( 0, 128, 0 )); - m_table[Color_Blue] .SetTextColour(wxColor( 0, 0, 128 )); - m_table[Color_Magenta] .SetTextColour(wxColor( 160, 0, 160 )); - m_table[Color_Orange] .SetTextColour(wxColor( 160, 120, 0 )); - m_table[Color_Gray] .SetTextColour(wxColor( 108, 108, 108 )); - - m_table[Color_Cyan] .SetTextColour(wxColor( 128, 180, 180 )); - m_table[Color_Yellow] .SetTextColour(wxColor( 180, 180, 128 )); - m_table[Color_White] .SetTextColour(wxColor( 160, 160, 160 )); - - m_table[Color_StrongBlack] .SetTextColour(wxColor( 0, 0, 0 )); - m_table[Color_StrongRed] .SetTextColour(wxColor( 128, 0, 0 )); - m_table[Color_StrongGreen] .SetTextColour(wxColor( 0, 128, 0 )); - m_table[Color_StrongBlue] .SetTextColour(wxColor( 0, 0, 128 )); - m_table[Color_StrongMagenta].SetTextColour(wxColor( 160, 0, 160 )); - m_table[Color_StrongOrange] .SetTextColour(wxColor( 160, 120, 0 )); - m_table[Color_StrongGray] .SetTextColour(wxColor( 108, 108, 108 )); - - m_table[Color_StrongCyan] .SetTextColour(wxColor( 128, 180, 180 )); - m_table[Color_StrongYellow] .SetTextColour(wxColor( 180, 180, 128 )); - m_table[Color_StrongWhite] .SetTextColour(wxColor( 160, 160, 160 )); -} - -// fixme - not implemented yet. -void ConsoleLogFrame::ColorArray::SetFont( const wxFont& font ) -{ - //for( int i=0; iEnabled initial value is ignored when loading. - if (ini.IsSaving() && !ConLogInitialized) - log->Enabled = ConLogDefaults[i]; - ini.Entry(StringUtil::UTF8StringToWxString(log->GetCategory() + "." + log->GetShortName()), log->Enabled, ConLogDefaults[i]); - } - } - - ConLogInitialized = true; -} - -// -------------------------------------------------------------------------------------- -// ConsoleLogFrame (implementations) -// -------------------------------------------------------------------------------------- -ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, AppConfig::ConsoleLogOptions& options ) - : wxFrame(parent, wxID_ANY, title) - , m_conf( options ) - , m_TextCtrl( *new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH2 | wxTE_NOHIDESEL) ) - , m_timer_FlushUnlocker( this ) - , m_ColorTable( options.FontSize ) - - , m_pendingFlushMsg(false) - , m_WaitingThreadsForFlush(0) - , m_QueueColorSection( "ConsoleLog::QueueColorSection" ) - , m_QueueBuffer( "ConsoleLog::QueueBuffer" ) - , m_threadlogger( EnableThreadedLoggingTest ? new ConsoleTestThread() : NULL ) -{ - m_CurQueuePos = 0; - m_FlushRefreshLocked = false; - - // create Log menu (contains most options) - wxMenuBar *pMenuBar = new wxMenuBar(); - SetMenuBar( pMenuBar ); - SetIcons( wxGetApp().GetIconBundle() ); - - if (m_conf.Theme.CmpNoCase(L"Dark") == 0) - { - m_ColorTable.SetColorScheme_Dark(); - m_TextCtrl.SetBackgroundColour(darkThemeBgColor); - m_TextCtrl.SetDefaultStyle(wxTextAttr(wxNullColour, darkThemeBgColor)); - } - else - { - m_ColorTable.SetColorScheme_Light(); - m_TextCtrl.SetBackgroundColour(lightThemeBgColor); - m_TextCtrl.SetDefaultStyle(wxTextAttr(wxNullColour, lightThemeBgColor)); - } - - // TODO - SetDefaultStyle _should_ be returning a wxTextAttr with both foreground and background color info - // but I don't want to mess with it too much in fear of breaking existing functionality. - // instead, i just set the background color individually above - m_TextCtrl.SetDefaultStyle(m_ColorTable[DefaultConsoleColor]); - - // SetDefaultStyle only sets the style of text in the control. We need to - // also set the font of the control, so that sizing logic knows what font we use: - m_TextCtrl.SetFont( m_ColorTable[DefaultConsoleColor].GetFont() ); - - wxMenu& menuLog (*new wxMenu()); - wxMenu& menuAppear (*new wxMenu()); - wxMenu& menuSources (*new wxMenu()); - wxMenu& menuFontSizes( menuAppear ); - - // create Appearance menu and submenus - - menuFontSizes.Append( MenuId_FontSize_Small, _("&Small"), _t("7px font size."), - wxITEM_RADIO )->Check( options.FontSize == 7 ); - menuFontSizes.Append( MenuId_FontSize_Normal, _("&Normal Font"),_t("8px font size."), - wxITEM_RADIO )->Check( options.FontSize == 8 ); - menuFontSizes.Append( MenuId_FontSize_Large, _("&Large"), _t("10px font size."), - wxITEM_RADIO )->Check( options.FontSize == 10 ); - menuFontSizes.Append( MenuId_FontSize_Huge, _("&Huge"), _t("12px font size."), - wxITEM_RADIO )->Check( options.FontSize == 12 ); - - menuFontSizes.AppendSeparator(); - menuFontSizes.Append( MenuId_ColorScheme_Light, _("&Light Theme"), _t("Default soft-tone color scheme."), wxITEM_RADIO ); - menuFontSizes.Append( MenuId_ColorScheme_Dark, _("&Dark Theme"), _t("Modern dark color scheme."), wxITEM_RADIO ); - - // The "Always on Top" option currently doesn't work - //menuAppear.AppendSeparator(); - //menuAppear.Append( wxID_ANY, _("Always on Top"), - // _t("When checked the log window will be visible over other foreground windows."), wxITEM_CHECK ); - - menuLog.Append(wxID_SAVE, _("&Save..."), _("Save log contents to file.")); -#ifdef PCSX2_DEVBUILD - menuLog.Append(MenuId_Log_Settings, _("&Settings..."), _("Open the logging settings dialog.")); -#endif - menuLog.Append(wxID_CLEAR, _("C&lear"), _("Clear the log window contents.")); - menuLog.AppendSeparator(); - menuLog.AppendCheckItem(MenuId_AutoDock, _("Auto&dock"), _("Dock log window to main PCSX2 window."))->Check(m_conf.AutoDock); - menuLog.AppendSubMenu( &menuAppear, _("&Appearance") ); - menuLog.AppendSeparator(); - menuLog.Append(wxID_CLOSE, _("&Close"), _("Close this log window; contents are preserved.")); - - // Source Selection/Toggle menu - - menuSources.Append( MenuId_LogSource_Devel, _("Dev/&Verbose"), _("Shows PCSX2 developer logs."), wxITEM_CHECK ); - menuSources.Append( MenuId_LogSource_CDVD_Info, _("&CDVD reads"), _("Shows disk read activity."), wxITEM_CHECK ); - - menuSources.AppendSeparator(); - - uint srcnt = std::size(ConLogSources); - for (uint i=0; iGetName(), log->GetDescription(), wxITEM_CHECK ); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleSource, this, MenuId_LogSource_Start + i); - } - else - menuSources.AppendSeparator(); - } - - menuSources.AppendSeparator(); - menuSources.Append( MenuId_LogSource_EnableAll, _("&Enable All"), _("Enables all log source filters.") ); - menuSources.Append( MenuId_LogSource_DisableAll, _("&Disable All"), _("Disables all log source filters.") ); - menuSources.Append( MenuId_LogSource_SetDefault, _("&Restore Default"), _("Restore default source filters.") ); - - pMenuBar->Append(&menuLog, _("&Log")); - pMenuBar->Append(&menuSources, _("&Sources")); - - // status bar for menu prompts - CreateStatusBar(); - - SetSize( wxRect( options.DisplayPosition, options.DisplaySize ) ); - Show( options.Visible ); - - // Bind Events: - - Bind(wxEVT_MENU, &ConsoleLogFrame::OnOpen, this, wxID_OPEN); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnClose, this, wxID_CLOSE); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnSave, this, wxID_SAVE); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnClear, this, wxID_CLEAR); -#ifdef PCSX2_DEVBUILD - Bind(wxEVT_MENU, &ConsoleLogFrame::OnLogSettings, this, MenuId_Log_Settings); -#endif - - Bind(wxEVT_MENU, &ConsoleLogFrame::OnFontSize, this, MenuId_FontSize_Small, MenuId_FontSize_Huge); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleTheme, this, MenuId_ColorScheme_Light, MenuId_ColorScheme_Dark); - - Bind(wxEVT_MENU, &ConsoleLogFrame::OnAutoDock, this, MenuId_AutoDock); - - Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleSource, this, MenuId_LogSource_Devel); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleCDVDInfo, this, MenuId_LogSource_CDVD_Info); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnEnableAllLogging, this, MenuId_LogSource_EnableAll); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnDisableAllLogging, this, MenuId_LogSource_DisableAll); - Bind(wxEVT_MENU, &ConsoleLogFrame::OnSetDefaultLogging, this, MenuId_LogSource_SetDefault); - - Bind(wxEVT_CLOSE_WINDOW, &ConsoleLogFrame::OnCloseWindow, this); - Bind(wxEVT_MOVE, &ConsoleLogFrame::OnMoveAround, this); - Bind(wxEVT_SIZE, &ConsoleLogFrame::OnResize, this); - Bind(wxEVT_ACTIVATE, &ConsoleLogFrame::OnActivate, this); - - Bind(pxEvt_SetTitleText, &ConsoleLogFrame::OnSetTitle, this); - Bind(pxEvt_FlushQueue, &ConsoleLogFrame::OnFlushEvent, this); - - Bind(wxEVT_TIMER, &ConsoleLogFrame::OnFlushUnlockerTimer, this, m_timer_FlushUnlocker.GetId()); - - if( m_threadlogger != NULL ) - m_threadlogger->Start(); - - OnLoggingChanged(); - - if (0==m_conf.Theme.CmpNoCase(L"Dark")) - { - pMenuBar->Check(MenuId_ColorScheme_Dark, true); - } - else //if ((0==m_conf.Theme.CmpNoCase("Default")) || (0==m_conf.Theme.CmpNoCase("Light"))) - { - pMenuBar->Check(MenuId_ColorScheme_Light, true); - } -} - -ConsoleLogFrame::~ConsoleLogFrame() -{ - ScopedLogLock locker; - wxGetApp().OnProgramLogClosed( GetId() ); -} - -void ConsoleLogFrame::OnEnableAllLogging(wxCommandEvent& evt) -{ - uint srcnt = std::size(ConLogSources); - for (uint i=0; iEnabled = true; - } - DevConWriterEnabled = true; - // Safe to change - it's read only in the core thread and only affects log output. - const_cast(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads = true; - - OnLoggingChanged(); - evt.Skip(); -} - -void ConsoleLogFrame::OnDisableAllLogging(wxCommandEvent& evt) -{ - uint srcnt = std::size(ConLogSources); - for (uint i=0; iEnabled = false; - } - DevConWriterEnabled = false; - // Safe to change - it's read only in the core thread and only affects log output. - const_cast(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads = false; - - OnLoggingChanged(); - evt.Skip(); -} - -void ConsoleLogFrame::OnSetDefaultLogging(wxCommandEvent& evt) -{ - uint srcnt = std::size(ConLogSources); - for (uint i = 0; iEnabled = ConLogDefaults[i]; - } - DevConWriterEnabled = false; - // Safe to change - it's read only in the core thread and only affects log output. - const_cast(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads = false; - - OnLoggingChanged(); - evt.Skip(); -} - -void ConsoleLogFrame::OnLoggingChanged() -{ - if (!GetMenuBar()) return; - - if( wxMenuItem* item = GetMenuBar()->FindItem(MenuId_LogSource_Devel) ) - item->Check( DevConWriterEnabled ); - - if( wxMenuItem* item = GetMenuBar()->FindItem(MenuId_LogSource_CDVD_Info) ) - item->Check( g_Conf->EmuOptions.CdvdVerboseReads ); - - uint srcnt = std::size(ConLogSources); - for (uint i=0; iCheck( MenuId_LogSource_Start+i, log->IsActive() ); - } - GetMenuBar()->Enable( MenuId_LogSource_Start + MenuId_LogSources_Offset_recordingConsole, g_Conf->EmuOptions.EnableRecordingTools); - GetMenuBar()->Enable( MenuId_LogSource_Start + MenuId_LogSources_Offset_controlInfo, g_Conf->EmuOptions.EnableRecordingTools); - } -} - -void ConsoleLogFrame::UpdateLogList() -{ - OnLoggingChanged(); -} - -// Implementation note: Calls SetColor and Write( text ). Override those virtuals -// and this one will magically follow suite. :) -bool ConsoleLogFrame::Write( ConsoleColors color, const wxString& text ) -{ - pthread_testcancel(); - - ScopedLock lock( m_mtx_Queue ); - - if( m_QueueColorSection.GetLength() == 0 ) - { - pxAssertMsg( m_CurQueuePos == 0, "Queue's character position didn't get reset in sync with it's ColorSection table." ); - } - - if( (m_QueueColorSection.GetLength() == 0) || ((color != Color_Current) && (m_QueueColorSection.GetLast().color != color)) ) - { - ++m_CurQueuePos; // Don't overwrite the NULL; - m_QueueColorSection.Add( ColorSection(color, m_CurQueuePos) ); - } - - int endpos = m_CurQueuePos + text.Length(); - m_QueueBuffer.MakeRoomFor( endpos + 1 ); // and the null!! - memcpy( &m_QueueBuffer[m_CurQueuePos], text.wc_str(), sizeof(wxChar) * text.Length() ); - m_CurQueuePos = endpos; - - // this NULL may be overwritten if the next message sent doesn't perform a color change. - m_QueueBuffer[m_CurQueuePos] = 0; - - // Idle events don't always pass (wx blocks them when moving windows or using menus, for - // example). So let's hackfix it so that an alternate message is posted if the queue is - // "piling up." - - if( !m_pendingFlushMsg ) - { - m_pendingFlushMsg = true; - - // wxWidgets may have aggressive locks on event processing, so best to release - // our own mutex lest wx get hung for an extended period of time and cause all - // of our own stuff to get sluggish. - lock.Release(); - - wxCommandEvent evt( pxEvt_FlushQueue ); - evt.SetInt( 0 ); - if( wxThread::IsMain() ) - { - OnFlushEvent( evt ); - return false; - } - else - GetEventHandler()->AddPendingEvent( evt ); - - lock.Acquire(); - } - - if( !wxThread::IsMain() ) - { - // Too many color changes causes huge slowdowns when decorating the rich textview, so - // include a secondary check to avoid having a colorful log spam killing gui responsiveness. - - if( m_CurQueuePos > 0x100000 || m_QueueColorSection.GetLength() > 256 ) - { - ++m_WaitingThreadsForFlush; - lock.Release(); - - // Note: if the queue flushes, we need to return TRUE, so that our thread sleeps - // until the main thread has had a chance to repaint the console window contents. - // [TODO] : It'd be a lot better if the console window repaint released the lock - // once its task were complete, but thats been problematic, so for now this hack is - // what we get. - if( m_sem_QueueFlushed.Wait( wxTimeSpan( 0,0,0,250 ) ) ) return true; - - // If we're here it means QueueFlush wait timed out, so remove us from the waiting - // threads count. This way no thread permanently deadlocks against the console - // logger. They just run quite slow, but should remain responsive to user input. - lock.Acquire(); - if( m_WaitingThreadsForFlush != 0 ) --m_WaitingThreadsForFlush; - } - } - - return false; -} - -bool ConsoleLogFrame::Newline() -{ - return Write( Color_Current, L"\n" ); -} - -// ================================================================================= -// Section : Event Handlers -// * Misc Window Events (Move, Resize,etc) -// * Menu Events -// * Logging Events -// ================================================================================= - -void ConsoleLogFrame::OnMoveAround( wxMoveEvent& evt ) -{ - if( IsBeingDeleted() || !IsVisible() || IsIconized() ) return; - - // Docking check! If the window position is within some amount - // of the main window, enable docking. - - if( wxWindow* main = GetParent() ) - { - wxPoint topright( main->GetRect().GetTopRight() ); - wxRect snapzone( topright - wxSize( 8,8 ), wxSize( 16,16 ) ); - - m_conf.AutoDock = snapzone.Contains( GetPosition() ); - //Console.WriteLn( "DockCheck: %d", g_Conf->ConLogBox.AutoDock ); - if( m_conf.AutoDock ) - { - SetPosition( topright + wxSize( 1,0 ) ); - m_conf.AutoDock = true; - } - } - if (!IsMaximized()) - m_conf.DisplayPosition = GetPosition(); - evt.Skip(); -} - -void ConsoleLogFrame::OnResize( wxSizeEvent& evt ) -{ - if (!IsMaximized()) - m_conf.DisplaySize = GetSize(); - evt.Skip(); -} - -// ---------------------------------------------------------------------------- -// OnFocus / OnActivate : Special implementation to "connect" the console log window -// with the main frame window. When one is clicked, the other is assured to be brought -// to the foreground with it. (Currently only MSW only, as wxWidgets appears to have no -// equivalent to this). We don't bother with OnFocus here because it doesn't propagate -// up the window hierarchy anyway, so it always gets swallowed by the text control. -// But no matter: the console doesn't have the same problem as the Main Window of missing -// the initial activation event. - -/*void ConsoleLogFrame::OnFocus( wxFocusEvent& evt ) -{ - if( MainEmuFrame* mainframe = GetMainFramePtr() ) - MSW_SetWindowAfter( mainframe->GetHandle(), GetHandle() ); - - evt.Skip(); -}*/ - -void ConsoleLogFrame::OnActivate( wxActivateEvent& evt ) -{ - if( MainEmuFrame* mainframe = GetMainFramePtr() ) - MSW_SetWindowAfter( mainframe->GetHandle(), GetHandle() ); - - evt.Skip(); -} -// ---------------------------------------------------------------------------- - -void ConsoleLogFrame::OnCloseWindow(wxCloseEvent& event) -{ - if( event.CanVeto() ) - { - // instead of closing just hide the window to be able to Show() it later - Show( false ); - - // In the nogui case there might not be a Main frame window. - if (MainEmuFrame* mainframe = GetMainFramePtr()) - mainframe->OnLogBoxHidden(); - } - else - { - // This is sent when the app is exiting typically, so do a full close. - m_threadlogger = NULL; - wxGetApp().OnProgramLogClosed( GetId() ); - event.Skip(); - } -} - -void ConsoleLogFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) -{ - Show(true); -} - -void ConsoleLogFrame::OnClose( wxCommandEvent& event ) -{ - Close( false ); -} - -void ConsoleLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) -{ - wxString filename; - wxFile file; - bool rc = OpenLogFile( file, filename, this ); - if ( !rc ) - { - // canceled - return; - } - - // retrieve text and save it - // ------------------------- - int nLines = m_TextCtrl.GetNumberOfLines(); - for ( int nLine = 0; nLine < nLines; nLine++ ) - { - if( !file.Write(m_TextCtrl.GetLineText(nLine) + wxTextFile::GetEOL()) ) - { - wxLogError( L"Can't save log contents to file." ); - return; - } - } -} - -void ConsoleLogFrame::OnClear(wxCommandEvent& WXUNUSED(event)) -{ - m_TextCtrl.Clear(); -} - -void ConsoleLogFrame::OnLogSettings(wxCommandEvent& WXUNUSED(event)) -{ - AppOpenDialog( this ); -} - -void ConsoleLogFrame::OnToggleCDVDInfo( wxCommandEvent& evt ) -{ - evt.Skip(); - - if (!GetMenuBar()) return; - - if (evt.GetId() == MenuId_LogSource_CDVD_Info) - { - if( wxMenuItem* item = GetMenuBar()->FindItem(evt.GetId()) ) - { - g_Conf->EmuOptions.CdvdVerboseReads = item->IsChecked(); - const_cast(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads; // read-only in core thread, so it's safe to modify. - } - } -} - -void ConsoleLogFrame::OnToggleSource( wxCommandEvent& evt ) -{ - evt.Skip(); - - if (!GetMenuBar()) return; - - if (evt.GetId() == MenuId_LogSource_Devel) - { - if( wxMenuItem* item = GetMenuBar()->FindItem(evt.GetId()) ) - DevConWriterEnabled = item->IsChecked(); - - return; - } - - uint srcid = evt.GetId() - MenuId_LogSource_Start; - - if (!pxAssertDev( std::size(ConLogSources) > srcid, "Invalid source log index (out of bounds)" )) return; - if (!pxAssertDev( ConLogSources[srcid] != NULL, "Invalid source log index (NULL pointer [separator])" )) return; - - if( wxMenuItem* item = GetMenuBar()->FindItem(evt.GetId()) ) - { - pxAssertDev( item->IsCheckable(), "Uncheckable log source menu item? Seems fishy!" ); - ConLogSources[srcid]->Enabled = item->IsChecked(); - } -} - -void ConsoleLogFrame::OnToggleTheme(wxCommandEvent& evt) -{ - evt.Skip(); - const wxChar* newTheme = L"Default"; - switch (evt.GetId()) - { - case MenuId_ColorScheme_Dark: - newTheme = L"Dark"; - m_ColorTable.SetColorScheme_Dark(); - m_TextCtrl.SetBackgroundColour(darkThemeBgColor); - m_TextCtrl.SetDefaultStyle(wxTextAttr(wxNullColour, darkThemeBgColor)); - m_TextCtrl.Clear(); - break; - case MenuId_ColorScheme_Light: - default: - newTheme = L"Default"; - m_ColorTable.SetColorScheme_Light(); - m_TextCtrl.SetBackgroundColour(lightThemeBgColor); - m_TextCtrl.SetDefaultStyle(wxTextAttr(wxNullColour, lightThemeBgColor)); - m_TextCtrl.Clear(); - break; - } - - if (m_conf.Theme.CmpNoCase(newTheme) == 0) - return; - m_conf.Theme = newTheme; - m_ColorTable.SetFont(m_conf.FontSize); -} - -void ConsoleLogFrame::OnFontSize( wxCommandEvent& evt ) -{ - evt.Skip(); - - int ptsize = 8; - switch( evt.GetId() ) - { - case MenuId_FontSize_Small: ptsize = 7; break; - case MenuId_FontSize_Normal: ptsize = 8; break; - case MenuId_FontSize_Large: ptsize = 10; break; - case MenuId_FontSize_Huge: ptsize = 12; break; - } - - if( ptsize == m_conf.FontSize ) return; - - m_conf.FontSize = ptsize; - m_ColorTable.SetFont( ptsize ); - m_TextCtrl.SetDefaultStyle( m_ColorTable[Color_White] ); - - // TODO: Process the attributes of each character and upgrade the font size, - // while still retaining color and bold settings... (might be slow but then - // it hardly matters being a once-in-a-bluemoon action). -} - -void ConsoleLogFrame::OnAutoDock(wxCommandEvent& evt) -{ - if (auto menuBar = GetMenuBar()) - m_conf.AutoDock = menuBar->IsChecked(MenuId_AutoDock); - evt.Skip(); -} - -// ---------------------------------------------------------------------------- -// Logging Events (typically received from Console class interfaces) -// ---------------------------------------------------------------------------- - -void ConsoleLogFrame::OnSetTitle( wxCommandEvent& event ) -{ - SetTitle( event.GetString() ); -} - -void ConsoleLogFrame::DoFlushEvent( bool isPending ) -{ - // recursion guard needed due to Mutex lock/acquire code below, which can end up yielding - // to the gui and attempting to process more messages (which in turn would result in re- - // entering this handler). - - static int recursion_counter = 0; - RecursionGuard recguard( recursion_counter ); - if( recguard.IsReentrant() ) return; - - ScopedLock locker( m_mtx_Queue ); - - if( m_CurQueuePos != 0 ) - { - DoFlushQueue(); - } - - // Implementation note: I tried desperately to move this into wxEVT_IDLE, on the theory that - // we don't actually want to wake up pending threads until after the GUI's finished all its - // paperwork. But wxEVT_IDLE doesn't work when you click menus or the title bar of a window, - // making it pretty well annoyingly useless for just about anything. >_< - - if( m_WaitingThreadsForFlush > 0 ) - { - do { - m_sem_QueueFlushed.Post(); - } while( --m_WaitingThreadsForFlush > 0 ); - - int count = m_sem_QueueFlushed.Count(); - while( count < 0 ) { - m_sem_QueueFlushed.Post(); - count = m_sem_QueueFlushed.Count(); - } - } - - m_pendingFlushMsg = isPending; -} - -void ConsoleLogFrame::OnFlushUnlockerTimer( wxTimerEvent& ) -{ - m_FlushRefreshLocked = false; - DoFlushEvent( false ); -} - -void ConsoleLogFrame::OnFlushEvent( wxCommandEvent& ) -{ - if( m_FlushRefreshLocked ) return; - - DoFlushEvent( true ); - - m_FlushRefreshLocked = true; - m_timer_FlushUnlocker.Start( 100, true ); -} - -void ConsoleLogFrame::DoFlushQueue() -{ - int len = m_QueueColorSection.GetLength(); - pxAssert( len != 0 ); - - // Note, freezing/thawing actually seems to cause more overhead than it solves. - // It might be useful if we're posting like dozens of messages, but in our case - // we only post 1-4 typically, so better to leave things enabled. - //m_TextCtrl.Freeze(); - - // Manual InsertionPoint tracking avoids a lot of overhead in SetInsertionPointEnd() - wxTextPos insertPoint = m_TextCtrl.GetLastPosition(); - - // cap at 512k for now... - // fixme - 512k runs well on win32 but appears to be very sluggish on linux (but that could - // be a result of my using Xming + CoLinux). Might need platform dependent defaults here. --air - - static const int BufferSize = 0x80000; - if( (insertPoint + m_CurQueuePos) > BufferSize ) - { - int toKeep = BufferSize - m_CurQueuePos; - if( toKeep <= 10 ) - { - m_TextCtrl.Clear(); - insertPoint = 0; - } - else - { - int toRemove = BufferSize - toKeep; - if( toRemove < BufferSize / 4 ) toRemove = BufferSize; - m_TextCtrl.Remove( 0, toRemove ); - insertPoint -= toRemove; - } - } - - m_TextCtrl.SetInsertionPoint( insertPoint ); - - // fixme : Writing a lot of colored logs to the console can be quite slow when "spamming" - // is happening, due to the overhead of SetDefaultStyle and WriteText calls. I'm not sure - // if there's a better way to go about this? Using Freeze/Thaw helps a little bit, but it's - // still magnitudes slower than dumping a straight run. --air - - if( len > 64 ) m_TextCtrl.Freeze(); - - for( int i=0; i 64 ) m_TextCtrl.Thaw(); - - m_QueueColorSection.Clear(); - m_CurQueuePos = 0; -} - -ConsoleLogFrame* Pcsx2App::GetProgramLog() -{ - return (ConsoleLogFrame*) wxWindow::FindWindowById( m_id_ProgramLogBox ); -} - -const ConsoleLogFrame* Pcsx2App::GetProgramLog() const -{ - return (const ConsoleLogFrame*) wxWindow::FindWindowById( m_id_ProgramLogBox ); -} - -void Pcsx2App::ProgramLog_PostEvent( wxEvent& evt ) -{ - if( ConsoleLogFrame* proglog = GetProgramLog() ) - proglog->GetEventHandler()->AddPendingEvent( evt ); -} - -// -------------------------------------------------------------------------------------- -// ConsoleImpl_ToFile -// -------------------------------------------------------------------------------------- - -static void ConsoleToFile_Newline() -{ -#if defined(__POSIX__) - if ((g_Conf) && (g_Conf->EmuOptions.ConsoleToStdio)) ConsoleWriter_Stdout.Newline(); -#endif - -#if defined(__POSIX__) - fputc( '\n', emuLog ); -#else - fputs( "\r\n", emuLog ); -#endif -} - -static void ConsoleToFile_DoWrite( const char* fmt ) -{ -#if defined(__POSIX__) - if ((g_Conf) && (g_Conf->EmuOptions.ConsoleToStdio)) ConsoleWriter_Stdout.WriteRaw(fmt); -#endif - - px_fputs( emuLog, fmt ); -} - -static void ConsoleToFile_DoWriteLn( const char* fmt ) -{ - ConsoleToFile_DoWrite( fmt ); - ConsoleToFile_Newline(); - - if (emuLog != NULL) fflush( emuLog ); -} - -static void ConsoleToFile_SetTitle( const char* title ) -{ - ConsoleWriter_Stdout.SetTitle(title); -} - -static void ConsoleToFile_DoSetColor( ConsoleColors color ) -{ - ConsoleWriter_Stdout.DoSetColor(color); -} - -extern const IConsoleWriter ConsoleWriter_File; -const IConsoleWriter ConsoleWriter_File = -{ - ConsoleToFile_DoWrite, - ConsoleToFile_DoWriteLn, - ConsoleToFile_DoSetColor, - - ConsoleToFile_DoWrite, - ConsoleToFile_Newline, - ConsoleToFile_SetTitle, - - 0 -}; - -Mutex& Pcsx2App::GetProgramLogLock() -{ - return m_mtx_ProgramLog; -} - -// -------------------------------------------------------------------------------------- -// ConsoleToWindow Implementations -// -------------------------------------------------------------------------------------- -template< const IConsoleWriter& secondary > -static void ConsoleToWindow_SetTitle( const char* title ) -{ - secondary.SetTitle(title); - wxCommandEvent evt( pxEvt_SetTitleText ); - evt.SetString( wxString::FromUTF8(title) ); - wxGetApp().ProgramLog_PostEvent( evt ); -} - -template< const IConsoleWriter& secondary > -static void ConsoleToWindow_DoSetColor( ConsoleColors color ) -{ - secondary.DoSetColor(color); -} - -template< const IConsoleWriter& secondary > -static void ConsoleToWindow_Newline() -{ - secondary.Newline(); - - ScopedLogLock locker; - bool needsSleep = locker.WindowPtr && locker.WindowPtr->Newline(); - locker.Release(); - if( needsSleep ) wxGetApp().Ping(); -} - -template< const IConsoleWriter& secondary > -static void ConsoleToWindow_DoWrite( const char* fmt ) -{ - if( secondary.WriteRaw != NULL ) - secondary.WriteRaw( fmt ); - - ScopedLogLock locker; - bool needsSleep = locker.WindowPtr && locker.WindowPtr->Write( Console.GetColor(), wxString::FromUTF8(fmt) ); - locker.Release(); - if( needsSleep ) wxGetApp().Ping(); -} - -template< const IConsoleWriter& secondary > -static void ConsoleToWindow_DoWriteLn( const char* fmt ) -{ - if( secondary.DoWriteLn != NULL ) - secondary.DoWriteLn( fmt ); - - ScopedLogLock locker; - bool needsSleep = locker.WindowPtr && locker.WindowPtr->Write( Console.GetColor(), wxString::FromUTF8(fmt) + L'\n' ); - locker.Release(); - if( needsSleep ) wxGetApp().Ping(); -} - -typedef void DoWriteFn(const wxString&); - -static const IConsoleWriter ConsoleWriter_Window = -{ - ConsoleToWindow_DoWrite, - ConsoleToWindow_DoWriteLn, - ConsoleToWindow_DoSetColor, - - ConsoleToWindow_DoWrite, - ConsoleToWindow_Newline, - ConsoleToWindow_SetTitle, - - 0 -}; - -static const IConsoleWriter ConsoleWriter_WindowAndFile = -{ - ConsoleToWindow_DoWrite, - ConsoleToWindow_DoWriteLn, - ConsoleToWindow_DoSetColor, - - ConsoleToWindow_DoWrite, - ConsoleToWindow_Newline, - ConsoleToWindow_SetTitle, - - 0 -}; - -void Pcsx2App::EnableAllLogging() -{ - AffinityAssert_AllowFrom_MainUI(); - - const bool logBoxOpen = (m_ptr_ProgramLog != NULL); - const IConsoleWriter* newHandler = NULL; - - if( emuLog ) - { - if( !m_StdoutRedirHandle ) m_StdoutRedirHandle = std::unique_ptr(NewPipeRedir(stdout)); - if( !m_StderrRedirHandle ) m_StderrRedirHandle = std::unique_ptr(NewPipeRedir(stderr)); - newHandler = logBoxOpen ? (IConsoleWriter*)&ConsoleWriter_WindowAndFile : (IConsoleWriter*)&ConsoleWriter_File; - } - else - { - if( logBoxOpen ) - { - if (!m_StdoutRedirHandle) m_StdoutRedirHandle = std::unique_ptr(NewPipeRedir(stdout)); - if (!m_StderrRedirHandle) m_StderrRedirHandle = std::unique_ptr(NewPipeRedir(stderr)); - newHandler = &ConsoleWriter_Window; - } - else - newHandler = &ConsoleWriter_Stdout; - } - Console_SetActiveHandler( *newHandler ); -} - -// Used to disable the emuLog disk logger, typically used when disabling or re-initializing the -// emuLog file handle. Call SetConsoleLogging to re-enable the disk logger when finished. -void Pcsx2App::DisableDiskLogging() const -{ - AffinityAssert_AllowFrom_MainUI(); - - const bool logBoxOpen = (GetProgramLog() != NULL); - Console_SetActiveHandler( logBoxOpen ? (IConsoleWriter&)ConsoleWriter_Window : (IConsoleWriter&)ConsoleWriter_Stdout ); - - // Semi-hack: It's possible, however very unlikely, that a secondary thread could attempt - // to write to the logfile just before we disable logging, and would thus have a pending write - // operation to emuLog file handle at the same time we're trying to re-initialize it. The CRT - // has some guards of its own, and PCSX2 itself typically suspends the "log happy" threads - // when changing settings, so the chance for problems is low. We minimize it further here - // by sleeping off 5ms, which should allow any pending log-to-disk events to finish up. - // - // (the most correct solution would be a mutex lock in the Disk logger itself, but for now I - // am going to try and keep the logger lock-free and use this semi-hack instead). - - Threading::Sleep( 5 ); -} - -void Pcsx2App::DisableWindowLogging() const -{ - AffinityAssert_AllowFrom_MainUI(); - Console_SetActiveHandler( (emuLog!=NULL) ? (IConsoleWriter&)ConsoleWriter_File : (IConsoleWriter&)ConsoleWriter_Stdout ); -} - -void OSDlog(ConsoleColors color, bool console, const std::string& str) -{ - Host::AddOSDMessage(str, 15.0f); - - if (console) - Console.WriteLn(color, str.c_str()); -} diff --git a/pcsx2/gui/ConsoleLogger.h b/pcsx2/gui/ConsoleLogger.h deleted file mode 100644 index 02a0cfa008..0000000000 --- a/pcsx2/gui/ConsoleLogger.h +++ /dev/null @@ -1,247 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "App.h" -#include -#include -#include - -static const bool EnableThreadedLoggingTest = false; //true; - -class LogWriteEvent; - -// -------------------------------------------------------------------------------------- -// PipeRedirectionBase -// -------------------------------------------------------------------------------------- -// Implementations for this class are found in Win/Lnx specific modules. Class creation -// should be done using NewPipeRedir() only (hence the protected constructor in this class). -// -class PipeRedirectionBase -{ - DeclareNoncopyableObject( PipeRedirectionBase ); - -public: - virtual ~PipeRedirectionBase() =0; // abstract destructor, forces abstract class behavior - -protected: - PipeRedirectionBase() {} -}; - -extern PipeRedirectionBase* NewPipeRedir( FILE* stdstream ); - -// -------------------------------------------------------------------------------------- -// pxLogConsole -// -------------------------------------------------------------------------------------- -// This is a custom logging facility that pipes wxLog messages to our very own console -// log window. Useful for catching and redirecting wx's internal logs (although like -// 3/4ths of them are worthless and we would probably rather ignore them anyway). -// -class pxLogConsole : public wxLog -{ -public: - pxLogConsole() {} - -protected: - virtual void DoLogRecord(wxLogLevel level, const wxString &message, const wxLogRecordInfo &info); -}; - - -// -------------------------------------------------------------------------------------- -// ConsoleThreadTest -- useful class for unit testing the thread safety and general performance -// of the console logger. -// -------------------------------------------------------------------------------------- - -class ConsoleTestThread : public Threading::pxThread -{ - typedef pxThread _parent; - -protected: - std::atomic m_done; - void ExecuteTaskInThread(); - -public: - ConsoleTestThread() : - m_done( false ) - { - } - - ~ConsoleTestThread() - { - m_done = true; - } -}; - -// -------------------------------------------------------------------------------------- -// ConsoleLogFrame -- Because the one built in wx is poop. -// -------------------------------------------------------------------------------------- -class ConsoleLogFrame : public wxFrame -{ - DeclareNoncopyableObject(ConsoleLogFrame); - -public: - typedef AppConfig::ConsoleLogOptions ConLogConfig; - -protected: - class ColorArray - { - DeclareNoncopyableObject(ColorArray); - - protected: - std::array m_table; - - public: - virtual ~ColorArray() = default; - ColorArray( int fontsize=8 ); - - void SetFont( const wxFont& font ); - void SetFont( int fontsize ); - u32 GetRGBA( const ConsoleColors color ); - - const wxTextAttr& operator[]( ConsoleColors coloridx ) const - { - return m_table[(int)coloridx]; - } - - void SetColorScheme_Dark(); - void SetColorScheme_Light(); - }; - - class ColorSection - { - public: - ConsoleColors color; - int startpoint; - - ColorSection() : color(Color_Default), startpoint(0) {} - ColorSection( ConsoleColors _color, int msgptr ) : color(_color), startpoint(msgptr) { } - }; - -private: - wxColor lightThemeBgColor = wxColor(230, 235, 242); - wxColor darkThemeBgColor = wxColor(38, 41, 48); - -protected: - ConLogConfig& m_conf; - wxTextCtrl& m_TextCtrl; - wxTimer m_timer_FlushLimiter; - wxTimer m_timer_FlushUnlocker; - ColorArray m_ColorTable; - - int m_flushevent_counter; - bool m_FlushRefreshLocked; - - // ---------------------------------------------------------------------------- - // Queue State Management Vars - // ---------------------------------------------------------------------------- - - // Boolean indicating if a flush message is already in the Main message queue. Used - // to prevent spamming the main thread with redundant messages. - std::atomic m_pendingFlushMsg; - - // This is a counter of the number of threads waiting for the Queue to flush. - std::atomic m_WaitingThreadsForFlush; - - // Indicates to the main thread if a child thread is actively writing to the log. If - // true the main thread will sleep briefly to allow the child a chance to accumulate - // more messages (helps avoid rapid successive flushes on high volume logging). - std::atomic m_ThreadedLogInQueue; - - // Used by threads waiting on the queue to flush. - Semaphore m_sem_QueueFlushed; - - // Lock object for accessing or modifying the following three vars: - // m_QueueBuffer, m_QueueColorSelection, m_CurQueuePos - Mutex m_mtx_Queue; - - // Describes a series of colored text sections in the m_QueueBuffer. - SafeList m_QueueColorSection; - - // Series of Null-terminated strings, each one has a corresponding entry in - // m_QueueColorSelection. - SafeArray m_QueueBuffer; - - // Current write position into the m_QueueBuffer; - int m_CurQueuePos; - - // Threaded log spammer, useful for testing console logging performance. - // (alternatively you can enable Disasm logging in any recompiler and achieve - // a similar effect) - std::unique_ptr m_threadlogger; - -public: - // ctor & dtor - ConsoleLogFrame( MainEmuFrame *pParent, const wxString& szTitle, ConLogConfig& options ); - virtual ~ConsoleLogFrame(); - - // Retrieves the current configuration options settings for this box. - // (settings change if the user moves the window or changes the font size) - const ConLogConfig& GetConfig() const { return m_conf; } - u32 GetRGBA( const ConsoleColors color ) { return m_ColorTable.GetRGBA( color ); } - - bool Write( ConsoleColors color, const wxString& text ); - bool Newline(); - - void UpdateLogList(); - -protected: - // menu callbacks - void OnOpen (wxCommandEvent& event); - void OnClose(wxCommandEvent& event); - void OnSave (wxCommandEvent& event); - void OnClear(wxCommandEvent& event); - void OnLogSettings(wxCommandEvent& event); - - void OnEnableAllLogging(wxCommandEvent& event); - void OnDisableAllLogging(wxCommandEvent& event); - void OnSetDefaultLogging(wxCommandEvent& event); - - void OnToggleTheme(wxCommandEvent& event); - void OnFontSize(wxCommandEvent& event); - void OnAutoDock(wxCommandEvent& event); - void OnToggleSource(wxCommandEvent& event); - void OnToggleCDVDInfo(wxCommandEvent& event); - - virtual void OnCloseWindow(wxCloseEvent& event); - - void OnSetTitle( wxCommandEvent& event ); - void OnFlushUnlockerTimer( wxTimerEvent& evt ); - void OnFlushEvent( wxCommandEvent& event ); - - void DoFlushQueue(); - void DoFlushEvent( bool isPending ); - - void OnMoveAround( wxMoveEvent& evt ); - void OnResize( wxSizeEvent& evt ); - void OnActivate( wxActivateEvent& evt ); - - void OnLoggingChanged(); -}; - -void OSDlog(ConsoleColors color, bool console, const std::string& str); - -template -void OSDlog(ConsoleColors color, bool console, const std::string& format, Args ... args) { - if (!console) return; - - size_t size = snprintf( nullptr, 0, format.c_str(), args ... ) + 1; // Extra space for '\0' - std::vector buf(size); - snprintf( buf.data(), size, format.c_str(), args ... ); - - OSDlog(color, console, buf.data()); -} - - diff --git a/pcsx2/gui/Debugger/BreakpointWindow.cpp b/pcsx2/gui/Debugger/BreakpointWindow.cpp deleted file mode 100644 index 729643ce71..0000000000 --- a/pcsx2/gui/Debugger/BreakpointWindow.cpp +++ /dev/null @@ -1,347 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "BreakpointWindow.h" - - -wxBEGIN_EVENT_TABLE(BreakpointWindow, wxDialog) - EVT_RADIOBUTTON(wxID_ANY, BreakpointWindow::onRadioChange) - EVT_BUTTON(wxID_OK, BreakpointWindow::onButtonOk) -wxEND_EVENT_TABLE() - - -BreakpointWindow::BreakpointWindow( wxWindow* parent, DebugInterface* _cpu ) - : wxDialog(parent,wxID_ANY,L"Breakpoint"), cpu(_cpu) -{ - wxBoxSizer* topLevelSizer = new wxBoxSizer(wxVERTICAL); - - wxBoxSizer* upperPart = new wxBoxSizer(wxHORIZONTAL); - - wxFlexGridSizer* leftSizer = new wxFlexGridSizer(2,2,7,7); - - // address - wxStaticText* addressText = new wxStaticText(this,wxID_ANY,L"Address"); - editAddress = new wxTextCtrl(this,wxID_ANY,L""); - - leftSizer->Add(addressText,0,wxALIGN_CENTER_VERTICAL|wxBOTTOM,1); - leftSizer->Add(editAddress,1); - - // size - wxStaticText* sizeText = new wxStaticText(this,wxID_ANY,L"Size"); - editSize = new wxTextCtrl(this,wxID_ANY,L""); - leftSizer->Add(sizeText,0,wxALIGN_CENTER_VERTICAL|wxBOTTOM,1); - leftSizer->Add(editSize,1); - - // right part - wxFlexGridSizer* rightSizer = new wxFlexGridSizer(3,2,7,7); - - radioMemory = new wxRadioButton(this,wxID_ANY,L"Memory",wxDefaultPosition,wxDefaultSize,wxRB_GROUP); - radioExecute = new wxRadioButton(this,wxID_ANY,L"Execute"); - rightSizer->Add(radioMemory,1); - rightSizer->Add(radioExecute,1,wxLEFT,8); - - checkRead = new wxCheckBox(this,wxID_ANY,L"Read"); - checkWrite = new wxCheckBox(this,wxID_ANY,L"Write"); - checkOnChange = new wxCheckBox(this,wxID_ANY,L"On change"); - rightSizer->Add(checkRead,1); - rightSizer->Add(new wxStaticText(this,wxID_ANY,L""),1); - rightSizer->Add(checkWrite,1); - rightSizer->Add(checkOnChange,1,wxLEFT,8); - - upperPart->Add(leftSizer,1,wxLEFT|wxTOP|wxRIGHT,8); - upperPart->Add(rightSizer,1,wxLEFT|wxTOP|wxRIGHT,8); - - // bottom part - wxBoxSizer* conditionSizer = new wxBoxSizer(wxHORIZONTAL); - wxStaticText* conditionText = new wxStaticText(this,wxID_ANY,L"Condition"); - editCondition = new wxTextCtrl(this,wxID_ANY,L""); - conditionSizer->Add(conditionText,0,wxALIGN_CENTER_VERTICAL|wxBOTTOM,1); - conditionSizer->AddSpacer(7); - conditionSizer->Add(editCondition,1,wxEXPAND); - - wxBoxSizer* bottomRowSizer = new wxBoxSizer(wxHORIZONTAL); - checkEnabled = new wxCheckBox(this,wxID_ANY,L"Enabled"); - checkLog = new wxCheckBox(this,wxID_ANY,L"Log"); - buttonOk = new wxButton(this,wxID_OK,L"OK"); - buttonCancel = new wxButton(this,wxID_CANCEL,L"Cancel"); - bottomRowSizer->AddStretchSpacer(); - bottomRowSizer->Add(checkEnabled,0,wxALIGN_CENTER_VERTICAL|wxBOTTOM,1); - bottomRowSizer->AddSpacer(8); - bottomRowSizer->Add(checkLog,0,wxALIGN_CENTER_VERTICAL|wxBOTTOM,1); - bottomRowSizer->AddSpacer(8); - bottomRowSizer->Add(buttonOk,1); - bottomRowSizer->AddSpacer(4); - bottomRowSizer->Add(buttonCancel,1); - - // align labels - int minWidth = std::max(addressText->GetSize().x,sizeText->GetSize().x); - minWidth = std::max(minWidth,conditionText->GetSize().x); - addressText->SetMinSize(wxSize(minWidth,addressText->GetSize().y)); - sizeText->SetMinSize(wxSize(minWidth,sizeText->GetSize().y)); - conditionText->SetMinSize(wxSize(minWidth,conditionText->GetSize().y)); - - // set tab order - radioMemory->MoveAfterInTabOrder(editAddress); - radioExecute->MoveAfterInTabOrder(radioMemory); - editSize->MoveAfterInTabOrder(radioExecute); - checkRead->MoveAfterInTabOrder(editSize); - checkWrite->MoveAfterInTabOrder(checkRead); - checkOnChange->MoveAfterInTabOrder(checkWrite); - editCondition->MoveAfterInTabOrder(checkOnChange); - checkEnabled->MoveAfterInTabOrder(editCondition); - checkLog->MoveAfterInTabOrder(checkEnabled); - buttonOk->MoveAfterInTabOrder(checkLog); - buttonCancel->MoveAfterInTabOrder(buttonOk); - - topLevelSizer->Add(upperPart,0); - topLevelSizer->AddSpacer(5); - topLevelSizer->Add(conditionSizer,0,wxLEFT|wxTOP|wxRIGHT|wxEXPAND,8); - topLevelSizer->AddSpacer(5); - topLevelSizer->Add(bottomRowSizer,0,wxLEFT|wxTOP|wxRIGHT|wxBOTTOM,8); - SetSizer(topLevelSizer); - topLevelSizer->Fit(this); - - buttonOk->SetDefault(); - - // default values - memory = true; - onChange = false; - read = write = true; - enabled = log = true; - address = -1; - size = 1; - condition[0] = 0; - setDefaultValues(); -} - -void BreakpointWindow::setDefaultValues() -{ - radioExecute->SetValue(!memory); - radioMemory->SetValue(memory); - checkRead->SetValue(read); - checkWrite->SetValue(write); - checkOnChange->SetValue(onChange); - checkEnabled->SetValue(enabled); - checkLog->SetValue(log); - - checkRead->Enable(memory); - checkWrite->Enable(memory); - checkOnChange->Enable(memory); - checkRead->Enable(memory); - editSize->Enable(memory); - editCondition->Enable(!memory); - checkLog->Enable(memory); - - wchar_t str[64]; - if (address != 0xFFFFFFFF) - { - swprintf(str,64,L"0x%08X",address); - editAddress->SetValue(str); - } - - swprintf(str,64,L"0x%08X",size); - editSize->SetValue(str); - editCondition->SetValue(wxString(condition,wxConvUTF8)); -} - -void BreakpointWindow::loadFromMemcheck(MemCheck& memcheck) -{ - memory = true; - - read = (memcheck.cond & MEMCHECK_READ) != 0; - write = (memcheck.cond & MEMCHECK_WRITE) != 0; - onChange = (memcheck.cond & MEMCHECK_WRITE_ONCHANGE) != 0; - - switch (memcheck.result) - { - case MEMCHECK_BOTH: - log = enabled = true; - break; - case MEMCHECK_LOG: - log = true; - enabled = false; - break; - case MEMCHECK_BREAK: - log = false; - enabled = true; - break; - case MEMCHECK_IGNORE: - log = enabled = false; - break; - } - - address = memcheck.start; - size = memcheck.end-address; - - setDefaultValues(); -} - -void BreakpointWindow::loadFromBreakpoint(BreakPoint& breakpoint) -{ - memory = false; - - enabled = breakpoint.enabled; - address = breakpoint.addr; - size = 1; - - if (breakpoint.hasCond) - { - strcpy(condition,breakpoint.cond.expressionString); - } else { - condition[0] = 0; - } - - setDefaultValues(); -} - -void BreakpointWindow::initBreakpoint(u32 _address) -{ - memory = false; - enabled = true; - address = _address; - size = 1; - condition[0] = 0; - - setDefaultValues(); -} - -void BreakpointWindow::onRadioChange(wxCommandEvent& evt) -{ - memory = radioMemory->GetValue(); - - checkRead->Enable(memory); - checkWrite->Enable(memory); - checkOnChange->Enable(memory); - checkRead->Enable(memory); - editSize->Enable(memory); - editCondition->Enable(!memory); - checkLog->Enable(memory); -} - -bool BreakpointWindow::fetchDialogData() -{ - wchar_t errorMessage[512]; - PostfixExpression exp; - - memory = radioMemory->GetValue(); - read = checkRead->GetValue(); - write = checkWrite->GetValue(); - enabled = checkEnabled->GetValue(); - log = checkLog->GetValue(); - onChange = checkOnChange->GetValue(); - - // parse address - wxCharBuffer addressText = editAddress->GetValue().ToUTF8(); - if (!cpu->initExpression(addressText,exp)) - { - swprintf(errorMessage,512,L"Invalid expression \"%s\".",editAddress->GetValue().wchar_str().data()); - wxMessageBox(errorMessage,L"Error",wxICON_ERROR); - return false; - } - - u64 value; - if (!cpu->parseExpression(exp,value)) - { - swprintf(errorMessage,512,L"Invalid expression \"%s\".",editAddress->GetValue().wchar_str().data()); - wxMessageBox(errorMessage,L"Error",wxICON_ERROR); - return false; - } - address = value; - - if (memory) - { - // parse size - wxCharBuffer sizeText = editSize->GetValue().ToUTF8(); - if (!cpu->initExpression(sizeText,exp)) - { - swprintf(errorMessage,512,L"Invalid expression \"%s\".",editSize->GetValue().wchar_str().data()); - wxMessageBox(errorMessage,L"Error",wxICON_ERROR); - return false; - } - - if (!cpu->parseExpression(exp,value)) - { - swprintf(errorMessage,512,L"Invalid expression \"%s\".",editSize->GetValue().wchar_str().data()); - wxMessageBox(errorMessage,L"Error",wxICON_ERROR); - return false; - } - size = value; - } - - // condition - wxCharBuffer conditionText = editCondition->GetValue().ToUTF8(); - strncpy(condition,conditionText,sizeof(condition)); - condition[sizeof(condition)-1] = 0; - - compiledCondition.clear(); - if (condition[0] != 0) - { - if (!cpu->initExpression(condition,compiledCondition)) - { - swprintf(errorMessage,512,L"Invalid expression \"%s\".",editCondition->GetValue().wchar_str().data()); - wxMessageBox(errorMessage,L"Error",wxICON_ERROR); - return false; - } - } - - return true; -} - -void BreakpointWindow::onButtonOk(wxCommandEvent& evt) -{ - if (fetchDialogData()) - evt.Skip(); -} - -void BreakpointWindow::addBreakpoint() -{ - if (memory) - { - // add memcheck - int cond = 0; - if (read) - cond |= MEMCHECK_READ; - if (write) - cond |= MEMCHECK_WRITE; - if (onChange) - cond |= MEMCHECK_WRITE_ONCHANGE; - - MemCheckResult result; - if (log && enabled) result = MEMCHECK_BOTH; - else if (log) result = MEMCHECK_LOG; - else if (enabled) result = MEMCHECK_BREAK; - else result = MEMCHECK_IGNORE; - - CBreakPoints::AddMemCheck(cpu->getCpuType(), address, address + size, (MemCheckCondition)cond, result); - } else { - // add breakpoint - CBreakPoints::AddBreakPoint(cpu->getCpuType(), address,false); - - if (condition[0] != 0) - { - BreakPointCond cond; - cond.debug = cpu; - strcpy(cond.expressionString,condition); - cond.expression = compiledCondition; - CBreakPoints::ChangeBreakPointAddCond(cpu->getCpuType(), address,cond); - } - - if (!enabled) - { - CBreakPoints::ChangeBreakPoint(cpu->getCpuType(), address,false); - } - } -} diff --git a/pcsx2/gui/Debugger/BreakpointWindow.h b/pcsx2/gui/Debugger/BreakpointWindow.h deleted file mode 100644 index 482fc2f828..0000000000 --- a/pcsx2/gui/Debugger/BreakpointWindow.h +++ /dev/null @@ -1,63 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include -#include "DebugTools/DebugInterface.h" -#include "DebugTools/Breakpoints.h" - -class BreakpointWindow : public wxDialog -{ -public: - BreakpointWindow( wxWindow* parent, DebugInterface* _cpu ); - void loadFromMemcheck(MemCheck& memcheck); - void loadFromBreakpoint(BreakPoint& breakpoint); - void initBreakpoint(u32 _address); - void addBreakpoint(); - - wxDECLARE_EVENT_TABLE(); -protected: - void onRadioChange(wxCommandEvent& evt); - void onButtonOk(wxCommandEvent& evt); -private: - void setDefaultValues(); - bool fetchDialogData(); - - DebugInterface* cpu; - - wxTextCtrl* editAddress; - wxTextCtrl* editSize; - wxRadioButton* radioMemory; - wxRadioButton* radioExecute; - wxCheckBox* checkRead; - wxCheckBox* checkWrite; - wxCheckBox* checkOnChange; - wxTextCtrl* editCondition; - wxCheckBox* checkEnabled; - wxCheckBox* checkLog; - wxButton* buttonOk; - wxButton* buttonCancel; - - bool memory; - bool read; - bool write; - bool enabled; - bool log; - bool onChange; - u32 address; - u32 size; - char condition[128]; - PostfixExpression compiledCondition; -}; diff --git a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp deleted file mode 100644 index 18a68740a2..0000000000 --- a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp +++ /dev/null @@ -1,1379 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "CtrlDisassemblyView.h" -#include "DebugTools/Breakpoints.h" -#include "DebugTools/Debug.h" -#include "DebugTools/MipsAssembler.h" - -#include "DebugEvents.h" -#include "BreakpointWindow.h" -#include "gui/AppConfig.h" -#include "System.h" -#include "DisassemblyDialog.h" - -#include -#include -#include - -#include "gui/Resources/Breakpoint_Active.h" -#include "gui/Resources/Breakpoint_Inactive.h" - -wxBEGIN_EVENT_TABLE(CtrlDisassemblyView, wxWindow) - EVT_PAINT(CtrlDisassemblyView::paintEvent) - EVT_MOUSEWHEEL(CtrlDisassemblyView::mouseEvent) - EVT_LEFT_DOWN(CtrlDisassemblyView::mouseEvent) - EVT_LEFT_DCLICK(CtrlDisassemblyView::mouseEvent) - EVT_RIGHT_DOWN(CtrlDisassemblyView::mouseEvent) - EVT_RIGHT_UP(CtrlDisassemblyView::mouseEvent) - EVT_MOTION(CtrlDisassemblyView::mouseEvent) - EVT_KEY_DOWN(CtrlDisassemblyView::keydownEvent) - EVT_CHAR(CtrlDisassemblyView::keydownEvent) - EVT_SCROLLWIN_LINEUP(CtrlDisassemblyView::scrollbarEvent) - EVT_SCROLLWIN_LINEDOWN(CtrlDisassemblyView::scrollbarEvent) - EVT_SCROLLWIN_PAGEUP(CtrlDisassemblyView::scrollbarEvent) - EVT_SCROLLWIN_PAGEDOWN(CtrlDisassemblyView::scrollbarEvent) - EVT_SIZE(CtrlDisassemblyView::sizeEvent) - EVT_SET_FOCUS(CtrlDisassemblyView::focusEvent) - EVT_KILL_FOCUS(CtrlDisassemblyView::focusEvent) -wxEND_EVENT_TABLE() - -enum DisassemblyMenuIdentifiers -{ - ID_DISASM_COPYADDRESS = 1, - ID_DISASM_COPYINSTRUCTIONHEX, - ID_DISASM_COPYINSTRUCTIONDISASM, - ID_DISASM_DISASSEMBLETOFILE, - ID_DISASM_ASSEMBLE, - ID_DISASM_RUNTOHERE, - ID_DISASM_SETPCTOHERE, - ID_DISASM_TOGGLEBREAKPOINT, - ID_DISASM_FOLLOWBRANCH, - ID_DISASM_GOTOADDRESS, - ID_DISASM_GOTOINMEMORYVIEW, - ID_DISASM_KILLFUNCTION, - ID_DISASM_RENAMEFUNCTION, - ID_DISASM_REMOVEFUNCTION, - ID_DISASM_ADDFUNCTION -}; - -class NonAutoSelectTextCtrl : public wxTextCtrl -{ -public: - NonAutoSelectTextCtrl(wxWindow* parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr) - : wxTextCtrl(parent, id, value, pos, size, style, validator, name) - { - } -#ifdef _WIN32 - -#define WM_GETDLGCODE 0x0087 -#define DLGC_HASSETSEL 0x0008 - - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) - { - WXLRESULT result = wxTextCtrl::MSWWindowProc(nMsg, wParam, lParam); - if (nMsg == WM_GETDLGCODE) - result &= ~DLGC_HASSETSEL; - return result; - } -#endif -}; - -class TextEntryDialog : public wxDialog -{ -public: - TextEntryDialog(wxWindow* parent, wxString title, wxString defaultText) - : wxDialog(parent, wxID_ANY, title) - { - wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); - - textControl = new NonAutoSelectTextCtrl(this, wxID_ANY, L"", wxDefaultPosition, wxDefaultSize, 0); - textControl->SetValue(defaultText); - textControl->SetSelection(textControl->GetLastPosition(), textControl->GetLastPosition()); - sizer->Add(textControl, 0, wxEXPAND); - - wxBoxSizer* buttons = new wxBoxSizer(wxHORIZONTAL); - okButton = new wxButton(this, wxID_OK, L"OK"); - okButton->SetDefault(); - cancelButton = new wxButton(this, wxID_CANCEL, L"Cancel"); - - buttons->Add(okButton); - buttons->Add(cancelButton); - sizer->Add(buttons, 0, wxEXPAND); - - SetSizer(sizer); - sizer->Layout(); - sizer->Fit(this); - - textControl->SetFocus(); - textControl->SetFocusFromKbd(); - } - wxString getText() { return textControl->GetValue(); } - -private: - NonAutoSelectTextCtrl* textControl; - wxButton* okButton; - wxButton* cancelButton; -}; - -inline wxIcon _wxGetIconFromMemory(const unsigned char* data, int length) -{ - wxMemoryInputStream is(data, length); - wxBitmap b = wxBitmap(wxImage(is, wxBITMAP_TYPE_ANY, -1), -1); - wxIcon icon; - icon.CopyFromBitmap(b); - return icon; -} - -CtrlDisassemblyView::CtrlDisassemblyView(wxWindow* parent, DebugInterface* _cpu) - : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxBORDER_SIMPLE | wxVSCROLL) - , cpu(_cpu) -{ - manager.setCpu(cpu); - windowStart = 0x100000; - rowHeight = getDebugFontHeight() + 2; - charWidth = getDebugFontWidth(); - displaySymbols = true; - visibleRows = 1; - - bpEnabled = _wxGetIconFromMemory(res_Breakpoint_Active::Data, res_Breakpoint_Active::Length); - bpDisabled = _wxGetIconFromMemory(res_Breakpoint_Inactive::Data, res_Breakpoint_Inactive::Length); - - menu.Append(ID_DISASM_COPYADDRESS, L"Copy Address"); - menu.Append(ID_DISASM_COPYINSTRUCTIONHEX, L"Copy Instruction (Hex)"); - menu.Append(ID_DISASM_COPYINSTRUCTIONDISASM, L"Copy Instruction (Disasm)"); - menu.Append(ID_DISASM_DISASSEMBLETOFILE, L"Disassemble to File"); - menu.AppendSeparator(); - menu.Append(ID_DISASM_ASSEMBLE, L"Assemble Opcode(s)"); - menu.AppendSeparator(); - menu.Append(ID_DISASM_RUNTOHERE, L"Run to Cursor"); - menu.Append(ID_DISASM_SETPCTOHERE, L"Jump to Cursor"); - menu.Append(ID_DISASM_TOGGLEBREAKPOINT, L"Toggle Breakpoint"); - menu.Append(ID_DISASM_FOLLOWBRANCH, L"Follow Branch"); - menu.AppendSeparator(); - menu.Append(ID_DISASM_GOTOADDRESS, L"Go to Address"); - menu.Append(ID_DISASM_GOTOINMEMORYVIEW, L"Go to in Memory View"); - menu.AppendSeparator(); - menu.Append(ID_DISASM_ADDFUNCTION, L"Add Function Here"); - menu.Append(ID_DISASM_RENAMEFUNCTION, L"Rename Function"); - menu.Append(ID_DISASM_REMOVEFUNCTION, L"Remove Function"); - menu.Bind(wxEVT_MENU, &CtrlDisassemblyView::onPopupClick, this); - - SetScrollbar(wxVERTICAL, 100, 1, 201, true); - SetDoubleBuffered(true); - calculatePixelPositions(); - setCurAddress(windowStart); -} - -#ifdef _WIN32 -WXLRESULT CtrlDisassemblyView::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - switch (nMsg) - { - case 0x0104: // WM_SYSKEYDOWN, make f10 usable - if (wParam == 0x79) // f10 - { - postEvent(debEVT_STEPOVER, 0); - return 0; - } - break; - } - - return wxWindow::MSWWindowProc(nMsg, wParam, lParam); -} -#endif - -void CtrlDisassemblyView::scanFunctions() -{ - if (!cpu->isAlive()) - return; - - manager.analyze(windowStart, manager.getNthNextAddress(windowStart, visibleRows) - windowStart); -} - -void CtrlDisassemblyView::postEvent(wxEventType type, wxString text) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetClientData(cpu); - event.SetString(text); - wxPostEvent(this, event); -} - -void CtrlDisassemblyView::postEvent(wxEventType type, int value) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetClientData(cpu); - event.SetInt(value); - wxPostEvent(this, event); -} - -void CtrlDisassemblyView::paintEvent(wxPaintEvent& evt) -{ - wxPaintDC dc(this); - render(dc); -} - -void CtrlDisassemblyView::redraw() -{ - wxClientDC dc(this); - render(dc); -} - -bool CtrlDisassemblyView::getDisasmAddressText(u32 address, char* dest, bool abbreviateLabels, bool showData) -{ - if (displaySymbols) - { - const std::string addressSymbol = cpu->GetSymbolMap().GetLabelString(address); - if (!addressSymbol.empty()) - { - for (int k = 0; addressSymbol[k] != 0; k++) - { - // abbreviate long names - if (abbreviateLabels && k == 16 && addressSymbol[k + 1] != 0) - { - *dest++ = '+'; - break; - } - *dest++ = addressSymbol[k]; - } - *dest++ = ':'; - *dest = 0; - return true; - } - else - { - sprintf(dest, " %08X", address); - return false; - } - } - else - { - if (showData) - sprintf(dest, "%08X %08X", address, cpu->read32(address)); - else - sprintf(dest, "%08X", address); - return false; - } -} - -wxColor scaleColor(wxColor color, float factor) -{ - unsigned char r = color.Red(); - unsigned char g = color.Green(); - unsigned char b = color.Blue(); - unsigned char a = color.Alpha(); - - r = std::min(255, std::max((int)(r * factor), 0)); - g = std::min(255, std::max((int)(g * factor), 0)); - b = std::min(255, std::max((int)(b * factor), 0)); - - return wxColor(r, g, b, a); -} - -void CtrlDisassemblyView::drawBranchLine(wxDC& dc, std::map& addressPositions, BranchLine& line) -{ - u32 windowEnd = manager.getNthNextAddress(windowStart, visibleRows); - - int winBottom = GetSize().GetHeight(); - - int topY; - int bottomY; - if (line.first < windowStart) - { - topY = -1; - } - else if (line.first >= windowEnd) - { - topY = GetSize().GetHeight() + 1; - } - else - { - topY = addressPositions[line.first] + rowHeight / 2; - } - - if (line.second < windowStart) - { - bottomY = -1; - } - else if (line.second >= windowEnd) - { - bottomY = GetSize().GetHeight() + 1; - } - else - { - bottomY = addressPositions[line.second] + rowHeight / 2; - } - - if ((topY < 0 && bottomY < 0) || (topY > winBottom && bottomY > winBottom)) - { - return; - } - - // highlight line in a different color if it affects the currently selected opcode - wxColor color; - if (line.first == curAddress || line.second == curAddress) - { - color = wxColor(0xFF257AFA); - } - else - { - color = wxColor(0xFFFF3020); - } - - wxPen pen = wxPen(color); - dc.SetBrush(wxBrush(color)); - dc.SetPen(wxPen(color)); - - int x = pixelPositions.arrowsStart + line.laneIndex * 8; - - if (topY < 0) // first is not visible, but second is - { - dc.DrawLine(x - 2, bottomY, x + 2, bottomY); - dc.DrawLine(x + 2, bottomY, x + 2, 0); - - if (line.type == LINE_DOWN) - { - dc.DrawLine(x, bottomY - 4, x - 4, bottomY); - dc.DrawLine(x - 4, bottomY, x + 1, bottomY + 5); - } - } - else if (bottomY > winBottom) // second is not visible, but first is - { - dc.DrawLine(x - 2, topY, x + 2, topY); - dc.DrawLine(x + 2, topY, x + 2, winBottom); - - if (line.type == LINE_UP) - { - dc.DrawLine(x, topY - 4, x - 4, topY); - dc.DrawLine(x - 4, topY, x + 1, topY + 5); - } - } - else - { // both are visible - if (line.type == LINE_UP) - { - dc.DrawLine(x - 2, bottomY, x + 2, bottomY); - dc.DrawLine(x + 2, bottomY, x + 2, topY); - dc.DrawLine(x + 2, topY, x - 4, topY); - - dc.DrawLine(x, topY - 4, x - 4, topY); - dc.DrawLine(x - 4, topY, x + 1, topY + 5); - } - else - { - dc.DrawLine(x - 2, topY, x + 2, topY); - dc.DrawLine(x + 2, topY, x + 2, bottomY); - dc.DrawLine(x + 2, bottomY, x - 4, bottomY); - - dc.DrawLine(x, bottomY - 4, x - 4, bottomY); - dc.DrawLine(x - 4, bottomY, x + 1, bottomY + 5); - } - } -} - -int CtrlDisassemblyView::getBackgroundColor(unsigned int address) -{ - u32 colors[6] = {0xFFe0FFFF, 0xFFFFe0e0, 0xFFe8e8FF, 0xFFFFe0FF, 0xFFe0FFe0, 0xFFFFFFe0}; - int n = cpu->GetSymbolMap().GetFunctionNum(address); - if (n == -1) - return 0xFFFFFFFF; - return colors[n % 6]; -} - -std::set CtrlDisassemblyView::getSelectedLineArguments() -{ - std::set args; - - DisassemblyLineInfo line = DisassemblyLineInfo(); - for (u32 addr = selectRangeStart; addr < selectRangeEnd; addr += 4) - { - manager.getLine(addr, displaySymbols, line); - size_t p = 0, nextp = line.params.find(','); - while (nextp != line.params.npos) - { - args.insert(line.params.substr(p, nextp - p)); - p = nextp + 1; - nextp = line.params.find(',', p); - } - - if (p < line.params.size()) - { - args.insert(line.params.substr(p)); - } - - // check for registers in memory opcodes - p = line.params.find('('); - nextp = line.params.find(')'); - if (p != line.params.npos && nextp != line.params.npos && nextp > p) - { - args.insert(line.params.substr(p + 1, nextp - p - 1)); - } - } - - return args; -} - -void CtrlDisassemblyView::drawArguments(wxDC& dc, const DisassemblyLineInfo& line, int x, int y, wxColor& textColor, - const std::set& currentArguments) -{ - if (line.params.empty()) - return; - - // Don't highlight the selected lines. - if (isInInterval(selectRangeStart, selectRangeEnd - selectRangeStart, line.info.opcodeAddress)) - { - dc.DrawText(wxString(line.params.c_str(), wxConvUTF8), x, y); - return; - } - - wxColor highlightedColor = wxColor(textColor == 0xFF0000FF ? 0xFFAABB77 : 0xFFAABB00); - - size_t p = 0, nextp = line.params.find(','); - while (nextp != line.params.npos) - { - const std::string arg = line.params.substr(p, nextp - p); - if (currentArguments.find(arg) != currentArguments.end() && textColor != 0xFFFFFFFF) - { - dc.SetTextForeground(highlightedColor); - } - dc.DrawText(wxString(arg.c_str(), wxConvUTF8), x, y); - x += arg.size() * charWidth; - - p = nextp + 1; - nextp = line.params.find(',', p); - - dc.SetTextForeground(textColor); - dc.DrawText(L",", x, y); - x += charWidth; - } - if (p < line.params.size()) - { - const std::string arg = line.params.substr(p); - if (currentArguments.find(arg) != currentArguments.end() && textColor != 0xFFFFFFFF) - { - dc.SetTextForeground(highlightedColor); - } - dc.DrawText(wxString(arg.c_str(), wxConvUTF8), x, y); - dc.SetTextForeground(textColor); - } -} - -void CtrlDisassemblyView::render(wxDC& dc) -{ - // init stuff - int totalWidth, totalHeight; - GetSize(&totalWidth, &totalHeight); - visibleRows = totalHeight / rowHeight; - - // clear background - wxColor white = wxColor(0xFFFFFFFF); - - dc.SetBrush(wxBrush(white)); - dc.SetPen(wxPen(white)); - - int width, height; - dc.GetSize(&width, &height); - dc.DrawRectangle(0, 0, width, height); - - if (!cpu->isAlive()) - return; - - wxFont font = pxGetFixedFont(8); - wxFont boldFont = pxGetFixedFont(8, wxFONTWEIGHT_BOLD); - font.SetPixelSize(wxSize(charWidth, rowHeight - 2)); - boldFont.SetPixelSize(wxSize(charWidth, rowHeight - 2)); - - bool hasFocus = wxWindow::FindFocus() == this; - - std::map addressPositions; - - unsigned int address = windowStart; - - const std::set currentArguments = getSelectedLineArguments(); - DisassemblyLineInfo line = DisassemblyLineInfo(); - for (int i = 0; i < visibleRows + 1; i++) - { - manager.getLine(address, displaySymbols, line); - - int rowY1 = rowHeight * i; - - addressPositions[address] = rowY1; - - wxColor backgroundColor = wxColor(getBackgroundColor(address)); - wxColor textColor = wxColor(0xFF000000); - - if (isInInterval(address, line.totalSize, cpu->getPC())) - { - backgroundColor = scaleColor(backgroundColor, 1.05f); - } - - if (address >= selectRangeStart && address < selectRangeEnd) - { - if (hasFocus) - { - backgroundColor = address == curAddress ? 0xFFFF8822 : 0xFFFF9933; - textColor = 0xFFFFFFFF; - } - else - { - backgroundColor = 0xFFC0C0C0; - } - } - - // display whether the condition of a branch is met - if (line.info.isConditional && address == cpu->getPC()) - { - line.params += line.info.conditionMet ? " ; true" : " ; false"; - } - - // draw background - dc.SetBrush(wxBrush(backgroundColor)); - dc.SetPen(wxPen(backgroundColor)); - dc.DrawRectangle(0, rowY1, totalWidth, rowHeight); - - // display address/symbol - bool enabled; - if (CBreakPoints::IsAddressBreakPoint(cpu->getCpuType(), address, &enabled)) - { - if (enabled) - textColor = 0x0000FF; - int yOffset = std::max(-1, (rowHeight - 14 + 1) / 2); - dc.DrawIcon(enabled ? bpEnabled : bpDisabled, 2, rowY1 + 1 + yOffset); - } - - dc.SetTextForeground(textColor); - - char addressText[64]; - getDisasmAddressText(address, addressText, true, line.type == DISTYPE_OPCODE); - - dc.SetFont(font); - dc.DrawText(wxString(addressText, wxConvUTF8), pixelPositions.addressStart, rowY1 + 2); - drawArguments(dc, line, pixelPositions.argumentsStart, rowY1 + 2, textColor, currentArguments); - - if (isInInterval(address, line.totalSize, cpu->getPC())) - dc.DrawText(L"\u25A0", pixelPositions.opcodeStart - (charWidth + 1), rowY1); - - dc.SetFont(boldFont); - dc.DrawText(wxString(line.name.c_str(), wxConvUTF8), pixelPositions.opcodeStart, rowY1 + 2); - - address += line.totalSize; - } - - std::vector branchLines = manager.getBranchLines(windowStart, address - windowStart); - for (size_t i = 0; i < branchLines.size(); i++) - { - drawBranchLine(dc, addressPositions, branchLines[i]); - } -} - -void CtrlDisassemblyView::gotoAddress(u32 addr) -{ - u32 windowEnd = manager.getNthNextAddress(windowStart, visibleRows); - u32 newAddress = manager.getStartAddress(addr); - - if (newAddress < windowStart || newAddress >= windowEnd) - { - windowStart = manager.getNthPreviousAddress(newAddress, visibleRows / 2); - } - - setCurAddress(addr); - scanFunctions(); - redraw(); -} - -void CtrlDisassemblyView::scrollAddressIntoView() -{ - u32 windowEnd = manager.getNthNextAddress(windowStart, visibleRows); - - if (curAddress < windowStart) - windowStart = curAddress; - else if (curAddress >= windowEnd) - windowStart = manager.getNthPreviousAddress(curAddress, visibleRows - 1); - - scanFunctions(); -} - -void CtrlDisassemblyView::calculatePixelPositions() -{ - pixelPositions.addressStart = 16; - pixelPositions.opcodeStart = pixelPositions.addressStart + 18 * charWidth; - pixelPositions.argumentsStart = pixelPositions.opcodeStart + 9 * charWidth; - pixelPositions.arrowsStart = pixelPositions.argumentsStart + 30 * charWidth; -} - - -void CtrlDisassemblyView::followBranch() -{ - DisassemblyLineInfo line = DisassemblyLineInfo(); - manager.getLine(curAddress, true, line); - - if (line.type == DISTYPE_OPCODE || line.type == DISTYPE_MACRO) - { - if (line.info.isBranch) - { - jumpStack.push_back(curAddress); - gotoAddress(line.info.branchTarget); - } - else if (line.info.hasRelevantAddress) - { - // well, not exactly a branch, but we can do something anyway - postEvent(debEVT_GOTOINMEMORYVIEW, line.info.releventAddress); - } - } - else if (line.type == DISTYPE_DATA) - { - // jump to the start of the current line - postEvent(debEVT_GOTOINMEMORYVIEW, curAddress); - } -} - -void CtrlDisassemblyView::assembleOpcode(u32 address, std::string defaultText) -{ - u32 encoded; - - if (!cpu->isCpuPaused()) - { - wxMessageBox(L"Cannot change code while the core is running", L"Error.", wxICON_ERROR); - return; - } - - TextEntryDialog entry(this, L"Assemble opcode", wxString(defaultText.c_str(), wxConvUTF8)); - entry.Layout(); - - if (entry.ShowModal() != wxID_OK) - return; - - wxString op = entry.getText(); - std::string errorText; - bool result = MipsAssembleOpcode(op.To8BitData(), cpu, address, encoded, errorText); - if (result) - { - SysClearExecutionCache(); - - if ((selectRangeEnd - selectRangeStart) > 4) - { - for (u32 addr = selectRangeStart; addr < selectRangeEnd; addr += 0x4) - { - cpu->write32(addr, encoded); - } - } - else - { - cpu->write32(address, encoded); - } - - redraw(); - } - else - { - wxMessageBox(wxString(errorText.c_str(), wxConvUTF8), L"Error.", wxICON_ERROR); - } -} - - -void CtrlDisassemblyView::onPopupClick(wxCommandEvent& evt) -{ - switch (evt.GetId()) - { - case ID_DISASM_FOLLOWBRANCH: - followBranch(); - break; - case ID_DISASM_COPYADDRESS: - if (wxTheClipboard->Open()) - { - wchar_t text[64]; - swprintf(text, 64, L"%08X", curAddress); - - wxTheClipboard->SetData(new wxTextDataObject(text)); - wxTheClipboard->Close(); - } - break; - case ID_DISASM_GOTOADDRESS: - postEvent(debEVT_GOTOADDRESS, 0); - break; - case ID_DISASM_GOTOINMEMORYVIEW: - postEvent(debEVT_GOTOINMEMORYVIEW, curAddress); - break; - case ID_DISASM_COPYINSTRUCTIONHEX: - copyInstructions(selectRangeStart, selectRangeEnd, false); - break; - case ID_DISASM_COPYINSTRUCTIONDISASM: - copyInstructions(selectRangeStart, selectRangeEnd, true); - break; - case ID_DISASM_SETPCTOHERE: - cpu->setPc(curAddress); - redraw(); - break; - case ID_DISASM_RUNTOHERE: - postEvent(debEVT_RUNTOPOS, curAddress); - break; - case ID_DISASM_TOGGLEBREAKPOINT: - toggleBreakpoint(false); - break; - case ID_DISASM_DISASSEMBLETOFILE: - disassembleToFile(); - break; - case ID_DISASM_RENAMEFUNCTION: - { - u32 funcBegin = cpu->GetSymbolMap().GetFunctionStart(curAddress); - if (funcBegin != 0xFFFFFFFF) - { - wxString newName = wxGetTextFromUser(L"Enter the new function name", L"New function name", - wxString(cpu->GetSymbolMap().GetLabelString(funcBegin).c_str(), wxConvUTF8), this); - - if (!newName.empty()) - { - const wxCharBuffer converted = newName.ToUTF8(); - cpu->GetSymbolMap().SetLabelName(converted, funcBegin); - postEvent(debEVT_MAPLOADED, 0); - redraw(); - } - } - else - { - wxMessageBox(L"No symbol selected", L"Error", wxICON_ERROR); - } - break; - } - case ID_DISASM_REMOVEFUNCTION: - { - u32 funcBegin = cpu->GetSymbolMap().GetFunctionStart(curAddress); - if (funcBegin != 0xFFFFFFFF) - { - u32 prevBegin = cpu->GetSymbolMap().GetFunctionStart(funcBegin - 1); - if (prevBegin != 0xFFFFFFFF) - { - u32 expandedSize = cpu->GetSymbolMap().GetFunctionSize(prevBegin) + cpu->GetSymbolMap().GetFunctionSize(funcBegin); - cpu->GetSymbolMap().SetFunctionSize(prevBegin, expandedSize); - } - - cpu->GetSymbolMap().RemoveFunction(funcBegin, true); - cpu->GetSymbolMap().SortSymbols(); - cpu->GetSymbolMap().UpdateActiveSymbols(); - manager.clear(); - - postEvent(debEVT_MAPLOADED, 0); - } - else - { - postEvent(debEVT_SETSTATUSBARTEXT, L"WARNING: unable to find function symbol here"); - } - - redraw(); - break; - } - case ID_DISASM_ADDFUNCTION: - { - u32 prevBegin = cpu->GetSymbolMap().GetFunctionStart(curAddress); - if (prevBegin != 0xFFFFFFFF) - { - if (prevBegin == curAddress) - { - postEvent(debEVT_SETSTATUSBARTEXT, L"WARNING: There's already a function entry point at this adress"); - } - else - { - char symname[128]; - u32 prevSize = cpu->GetSymbolMap().GetFunctionSize(prevBegin); - u32 newSize = curAddress - prevBegin; - cpu->GetSymbolMap().SetFunctionSize(prevBegin, newSize); - - newSize = prevSize - newSize; - sprintf(symname, "u_un_%08X", curAddress); - cpu->GetSymbolMap().AddFunction(symname, curAddress, newSize); - cpu->GetSymbolMap().SortSymbols(); - cpu->GetSymbolMap().UpdateActiveSymbols(); - manager.clear(); - - postEvent(debEVT_MAPLOADED, 0); - } - } - else - { - char symname[128]; - int newSize = selectRangeEnd - selectRangeStart; - sprintf(symname, "u_un_%08X", selectRangeStart); - cpu->GetSymbolMap().AddFunction(symname, selectRangeStart, newSize); - cpu->GetSymbolMap().SortSymbols(); - cpu->GetSymbolMap().UpdateActiveSymbols(); - - postEvent(debEVT_MAPLOADED, 0); - } - - redraw(); - break; - } - case ID_DISASM_ASSEMBLE: - assembleOpcode(curAddress, disassembleCurAddress()); - break; - default: - wxMessageBox(L"Unimplemented.", L"Unimplemented.", wxICON_INFORMATION); - break; - } -} - -void CtrlDisassemblyView::keydownEvent(wxKeyEvent& evt) -{ - u32 windowEnd = manager.getNthNextAddress(windowStart, visibleRows); - - switch (evt.GetKeyCode()) - { - case 'g': - case 'G': - { - u64 addr; - if (!executeExpressionWindow(this, cpu, addr)) - return; - gotoAddress(addr); - } - break; - case 'd': - case 'D': - toggleBreakpoint(true); - break; - case 'e': - case 'E': - editBreakpoint(); - break; - case 'b': - case 'B': - { - BreakpointWindow bpw(this, cpu); - if (bpw.ShowModal() == wxID_OK) - { - bpw.addBreakpoint(); - postEvent(debEVT_UPDATE, 0); - } - } - break; - case 'm': - case 'M': - { - assembleOpcode(curAddress, ""); - } - break; - case WXK_LEFT: - if (jumpStack.empty()) - { - gotoAddress(cpu->getPC()); - } - else - { - u32 addr = jumpStack[jumpStack.size() - 1]; - jumpStack.pop_back(); - gotoAddress(addr); - } - break; - case WXK_RIGHT: - followBranch(); - break; - case WXK_UP: - setCurAddress(manager.getNthPreviousAddress(curAddress, 1), wxGetKeyState(WXK_SHIFT)); - scrollAddressIntoView(); - scanFunctions(); - break; - case WXK_DOWN: - setCurAddress(manager.getNthNextAddress(curAddress, 1), wxGetKeyState(WXK_SHIFT)); - scrollAddressIntoView(); - scanFunctions(); - break; - case WXK_TAB: - displaySymbols = !displaySymbols; - break; - case WXK_PAGEUP: - if (curAddress != windowStart && curAddressIsVisible()) - { - setCurAddress(windowStart, wxGetKeyState(WXK_SHIFT)); - scrollAddressIntoView(); - } - else - { - setCurAddress(manager.getNthPreviousAddress(windowStart, visibleRows), wxGetKeyState(WXK_SHIFT)); - scrollAddressIntoView(); - } - scanFunctions(); - break; - case WXK_PAGEDOWN: - if (manager.getNthNextAddress(curAddress, 1) != windowEnd && curAddressIsVisible()) - { - setCurAddress(manager.getNthPreviousAddress(windowEnd, 1), wxGetKeyState(WXK_SHIFT)); - scrollAddressIntoView(); - } - else - { - setCurAddress(manager.getNthNextAddress(windowEnd, visibleRows - 1), wxGetKeyState(WXK_SHIFT)); - scrollAddressIntoView(); - } - scanFunctions(); - break; - case WXK_F8: - postEvent(debEVT_STEPOUT, 0); - break; - case WXK_F10: - postEvent(debEVT_STEPOVER, 0); - return; - case WXK_F11: - if (evt.ShiftDown()) - postEvent(debEVT_STEPOUT, 0); - else - postEvent(debEVT_STEPINTO, 0); - return; - default: - evt.Skip(); - break; - } - - redraw(); -} - -void CtrlDisassemblyView::scrollbarEvent(wxScrollWinEvent& evt) -{ - int type = evt.GetEventType(); - if (type == wxEVT_SCROLLWIN_LINEUP) - { - windowStart = manager.getNthPreviousAddress(windowStart, 1); - scanFunctions(); - } - else if (type == wxEVT_SCROLLWIN_LINEDOWN) - { - windowStart = manager.getNthNextAddress(windowStart, 1); - scanFunctions(); - } - else if (type == wxEVT_SCROLLWIN_PAGEUP) - { - windowStart = manager.getNthPreviousAddress(windowStart, visibleRows); - scanFunctions(); - } - else if (type == wxEVT_SCROLLWIN_PAGEDOWN) - { - windowStart = manager.getNthNextAddress(windowStart, visibleRows); - scanFunctions(); - } - - redraw(); -} - -void CtrlDisassemblyView::toggleBreakpoint(bool toggleEnabled) -{ - bool enabled; - if (CBreakPoints::IsAddressBreakPoint(cpu->getCpuType(), curAddress, &enabled)) - { - if (!enabled) - { - // enable disabled breakpoints - CBreakPoints::ChangeBreakPoint(cpu->getCpuType(), curAddress, true); - } - else if (!toggleEnabled && CBreakPoints::GetBreakPointCondition(cpu->getCpuType(), curAddress) != NULL) - { - // don't just delete a breakpoint with a custom condition - CBreakPoints::RemoveBreakPoint(cpu->getCpuType(), curAddress); - } - else if (toggleEnabled) - { - // disable breakpoint - CBreakPoints::ChangeBreakPoint(cpu->getCpuType(), curAddress, false); - } - else - { - // otherwise just remove breakpoint - CBreakPoints::RemoveBreakPoint(cpu->getCpuType(), curAddress); - } - } - else - { - CBreakPoints::AddBreakPoint(cpu->getCpuType(), curAddress); - } -} - - -void CtrlDisassemblyView::updateStatusBarText() -{ - char text[512]; - DisassemblyLineInfo line = DisassemblyLineInfo(); - manager.getLine(curAddress, true, line); - - text[0] = 0; - if (line.type == DISTYPE_OPCODE || line.type == DISTYPE_MACRO) - { - if (line.info.isDataAccess) - { - if (!cpu->isValidAddress(line.info.dataAddress)) - { - sprintf(text, "Invalid address %08X", line.info.dataAddress); - } - else if (line.info.lrType == MIPSAnalyst::LOADSTORE_NORMAL && line.info.dataAddress % line.info.dataSize) - { - sprintf(text, "Unaligned address %08X", line.info.dataAddress); - } - else - { - switch (line.info.dataSize) - { - case 1: - sprintf(text, "[%08X] = %02X", line.info.dataAddress, cpu->read8(line.info.dataAddress)); - break; - case 2: - sprintf(text, "[%08X] = %04X", line.info.dataAddress, cpu->read16(line.info.dataAddress)); - break; - case 4: - { - u32 data; - if (line.info.lrType != MIPSAnalyst::LOADSTORE_NORMAL) - { - u32 address = line.info.dataAddress; - data = cpu->read32(address & ~3) >> (address & 3) * 8; - data |= cpu->read32((address + 3) & ~3) << (4 - (address & 3)) * 8; - } - else - { - data = cpu->read32(line.info.dataAddress); - } - - const std::string addressSymbol = cpu->GetSymbolMap().GetLabelString(data); - if (!addressSymbol.empty()) - { - sprintf(text, "[%08X] = %s (%08X)", line.info.dataAddress, addressSymbol.c_str(), data); - } - else - { - sprintf(text, "[%08X] = %08X", line.info.dataAddress, data); - } - break; - } - case 8: - { - u64 data; - if (line.info.lrType != MIPSAnalyst::LOADSTORE_NORMAL) - { - u32 address = line.info.dataAddress; - data = cpu->read64(address & ~7) >> (address & 7) * 8; - data |= cpu->read64((address + 7) & ~7) << (8 - (address & 7)) * 8; - } - else - { - data = cpu->read64(line.info.dataAddress); - } - - sprintf(text, "[%08X] = %016" PRIX64, line.info.dataAddress, data); - break; - } - case 16: - { - alignas(16) u128 data = cpu->read128(line.info.dataAddress); - sprintf(text, "[%08X] = %016" PRIX64 "%016" PRIX64, line.info.dataAddress, data._u64[1], data._u64[0]); - break; - } - } - } - } - - if (line.info.isBranch) - { - const std::string addressSymbol = cpu->GetSymbolMap().GetLabelString(line.info.branchTarget); - if (addressSymbol.empty()) - { - sprintf(text, "%08X", line.info.branchTarget); - } - else - { - sprintf(text, "%08X = %s", line.info.branchTarget, addressSymbol.c_str()); - } - } - } - else if (line.type == DISTYPE_DATA) - { - u32 start = cpu->GetSymbolMap().GetDataStart(curAddress); - if (start == 0xFFFFFFFF) - start = curAddress; - - u32 diff = curAddress - start; - const std::string label = cpu->GetSymbolMap().GetLabelString(start); - - if (!label.empty()) - { - if (diff != 0) - sprintf(text, "%08X (%s) + %08X", start, label.c_str(), diff); - else - sprintf(text, "%08X (%s)", start, label.c_str()); - } - else - { - if (diff != 0) - sprintf(text, "%08X + %08X", start, diff); - else - sprintf(text, "%08X", start); - } - } - - postEvent(debEVT_SETSTATUSBARTEXT, wxString(text, wxConvUTF8)); -} - -void CtrlDisassemblyView::mouseEvent(wxMouseEvent& evt) -{ - // left button - wxEventType type = evt.GetEventType(); - bool hasFocus = wxWindow::FindFocus() == this; - - if (type == wxEVT_LEFT_DOWN || type == wxEVT_LEFT_DCLICK || type == wxEVT_RIGHT_DOWN) - { - u32 newAddress = yToAddress(evt.GetY()); - bool setNewAddress = true; - - if (type == wxEVT_RIGHT_DOWN && !wxGetKeyState(WXK_SHIFT)) - { - // Maintain the current selection if right clicking into it. - if (newAddress >= selectRangeStart && newAddress < selectRangeEnd) - setNewAddress = false; - } - else - { - if (curAddress == newAddress && hasFocus) - toggleBreakpoint(false); - } - - if (setNewAddress) - setCurAddress(newAddress, wxGetKeyState(WXK_SHIFT)); - - SetFocus(); - SetFocusFromKbd(); - } - else if (evt.GetEventType() == wxEVT_RIGHT_UP) - { - PopupMenu(&menu, evt.GetPosition()); - return; - } - else if (evt.GetEventType() == wxEVT_MOUSEWHEEL) - { - if (evt.GetWheelRotation() > 0) - { - windowStart = manager.getNthPreviousAddress(windowStart, 3); - scanFunctions(); - } - else if (evt.GetWheelRotation() < 0) - { - windowStart = manager.getNthNextAddress(windowStart, 3); - scanFunctions(); - } - } - else if (evt.GetEventType() == wxEVT_MOTION) - { - if (evt.ButtonIsDown(wxMOUSE_BTN_LEFT)) - { - int newAddress = yToAddress(evt.GetY()); - setCurAddress(newAddress, wxGetKeyState(WXK_SHIFT)); - } - else - return; - } - else - { - evt.Skip(); - return; - } - - redraw(); -} - -void CtrlDisassemblyView::sizeEvent(wxSizeEvent& evt) -{ - wxSize s = evt.GetSize(); - visibleRows = s.GetWidth() / rowHeight; -} - -u32 CtrlDisassemblyView::yToAddress(int y) -{ - int line = y / rowHeight; - return manager.getNthNextAddress(windowStart, line); -} - -bool CtrlDisassemblyView::curAddressIsVisible() -{ - u32 windowEnd = manager.getNthNextAddress(windowStart, visibleRows); - return curAddress >= windowStart && curAddress < windowEnd; -} - -void CtrlDisassemblyView::scrollStepping(u32 newPc) -{ - u32 windowEnd = manager.getNthNextAddress(windowStart, visibleRows); - - newPc = manager.getStartAddress(newPc); - if (newPc >= windowEnd || newPc >= manager.getNthPreviousAddress(windowEnd, 1)) - { - windowStart = manager.getNthPreviousAddress(newPc, visibleRows - 2); - } -} - -std::string CtrlDisassemblyView::disassembleRange(u32 start, u32 size) -{ - std::string result; - - // gather all branch targets without labels - std::set branchAddresses; - for (u32 i = 0; i < size; i += 4) - { - MIPSAnalyst::MipsOpcodeInfo info = MIPSAnalyst::GetOpcodeInfo(cpu, start + i); - - if (info.isBranch && cpu->GetSymbolMap().GetLabelString(info.branchTarget).empty()) - { - if (branchAddresses.find(info.branchTarget) == branchAddresses.end()) - { - branchAddresses.insert(info.branchTarget); - } - } - } - - u32 disAddress = start; - bool previousLabel = true; - DisassemblyLineInfo line = DisassemblyLineInfo(); - while (disAddress < start + size) - { - char addressText[64], buffer[512]; - - manager.getLine(disAddress, displaySymbols, line); - bool isLabel = getDisasmAddressText(disAddress, addressText, false, line.type == DISTYPE_OPCODE); - - if (isLabel) - { - if (!previousLabel) - result += "\r\n"; - sprintf(buffer, "%s\r\n\r\n", addressText); - result += buffer; - } - else if (branchAddresses.find(disAddress) != branchAddresses.end()) - { - if (!previousLabel) - result += "\r\n"; - sprintf(buffer, "pos_%08X:\r\n\r\n", disAddress); - result += buffer; - } - - if (line.info.isBranch && !line.info.isBranchToRegister && cpu->GetSymbolMap().GetLabelString(line.info.branchTarget).empty() && branchAddresses.find(line.info.branchTarget) != branchAddresses.end()) - { - sprintf(buffer, "pos_%08X", line.info.branchTarget); - line.params = line.params.substr(0, line.params.find("0x")) + buffer; - } - - sprintf(buffer, "\t%s\t%s\r\n", line.name.c_str(), line.params.c_str()); - result += buffer; - previousLabel = isLabel; - disAddress += line.totalSize; - } - - return result; -} - -std::string CtrlDisassemblyView::disassembleCurAddress() -{ - DisassemblyLineInfo line = DisassemblyLineInfo(); - manager.getLine(curAddress, displaySymbols, line); - return line.name + (line.params.length() > 0 ? " " + line.params : ""); -} - -void CtrlDisassemblyView::copyInstructions(u32 startAddr, u32 endAddr, bool withDisasm) -{ - if (!wxTheClipboard->Open()) - { - wxMessageBox(L"Could not open clipboard.", L"Error", wxICON_ERROR); - return; - } - - if (!withDisasm) - { - int instructionSize = 4; - int count = (endAddr - startAddr) / instructionSize; - int space = count * 32; - char* temp = new char[space]; - - char* p = temp; - for (u32 pos = startAddr; pos < endAddr; pos += instructionSize) - { - p += sprintf(p, "%08X", cpu->read32(pos)); - - // Don't leave a trailing newline. - if (pos + instructionSize < endAddr) - p += sprintf(p, "\r\n"); - } - - wxTheClipboard->SetData(new wxTextDataObject(wxString(temp, wxConvUTF8))); - delete[] temp; - } - else - { - std::string disassembly = disassembleRange(startAddr, endAddr - startAddr); - wxTheClipboard->SetData(new wxTextDataObject(wxString(disassembly.c_str(), wxConvUTF8))); - } - - wxTheClipboard->Close(); -} - -void CtrlDisassemblyView::disassembleToFile() -{ - wxFileDialog dlg(this, wxEmptyString, wxEmptyString, wxEmptyString, L"*.*", wxFD_SAVE); - - if (dlg.ShowModal() == wxID_CANCEL) - return; - - std::string disassembly = disassembleRange(selectRangeStart, selectRangeEnd - selectRangeStart); - wxFile output(dlg.GetPath(), wxFile::write); - output.Write(wxString(disassembly.c_str(), wxConvUTF8)); -} - -void CtrlDisassemblyView::editBreakpoint() -{ - BreakpointWindow win(this, cpu); - - bool exists = false; - if (CBreakPoints::IsAddressBreakPoint(cpu->getCpuType(), curAddress)) - { - auto breakpoints = CBreakPoints::GetBreakpoints(); - for (size_t i = 0; i < breakpoints.size(); i++) - { - if (breakpoints[i].addr == curAddress) - { - win.loadFromBreakpoint(breakpoints[i]); - exists = true; - break; - } - } - } - - if (!exists) - win.initBreakpoint(curAddress); - - if (win.ShowModal() == wxID_OK) - { - if (exists) - CBreakPoints::RemoveBreakPoint(cpu->getCpuType(), curAddress); - win.addBreakpoint(); - postEvent(debEVT_UPDATE, 0); - } -} - -void CtrlDisassemblyView::getOpcodeText(u32 address, char* dest) -{ - DisassemblyLineInfo line = DisassemblyLineInfo(); - address = manager.getStartAddress(address); - manager.getLine(address, displaySymbols, line); - sprintf(dest, "%s %s", line.name.c_str(), line.params.c_str()); -} diff --git a/pcsx2/gui/Debugger/CtrlDisassemblyView.h b/pcsx2/gui/Debugger/CtrlDisassemblyView.h deleted file mode 100644 index 97b9e34d3c..0000000000 --- a/pcsx2/gui/Debugger/CtrlDisassemblyView.h +++ /dev/null @@ -1,111 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include - -#include "DebugTools/DebugInterface.h" -#include "DebugTools/DisassemblyManager.h" - -class CtrlDisassemblyView: public wxWindow -{ -public: - CtrlDisassemblyView(wxWindow* parent, DebugInterface* _cpu); - - void mouseEvent(wxMouseEvent& evt); - void paintEvent(wxPaintEvent & evt); - void keydownEvent(wxKeyEvent& evt); - void scrollbarEvent(wxScrollWinEvent& evt); - void sizeEvent(wxSizeEvent& evt); - void focusEvent(wxFocusEvent& evt) { Refresh(); }; -#ifdef _WIN32 - WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif - - void scanFunctions(); - void clearFunctions() { manager.clear(); }; - void redraw(); - void getOpcodeText(u32 address, char* dest); - - u32 getInstructionSizeAt(u32 address) - { - u32 start = manager.getStartAddress(address); - u32 next = manager.getNthNextAddress(start,1); - return next-address; - } - - void gotoAddress(u32 addr); - void gotoPc() { gotoAddress(cpu->getPC()); }; - void scrollStepping(u32 newPc); - wxDECLARE_EVENT_TABLE(); -private: - void drawBranchLine(wxDC& dc, std::map& addressPositions, BranchLine& line); - void render(wxDC& dc); - void calculatePixelPositions(); - bool getDisasmAddressText(u32 address, char* dest, bool abbreviateLabels, bool showData); - u32 yToAddress(int y); - bool curAddressIsVisible(); - void followBranch(); - void toggleBreakpoint(bool toggleEnabled); - void updateStatusBarText(); - std::string disassembleRange(u32 start, u32 size); - std::string disassembleCurAddress(); - void copyInstructions(u32 startAddr, u32 endAddr, bool withDisasm); - void disassembleToFile(); - void editBreakpoint(); - std::set getSelectedLineArguments(); - void drawArguments(wxDC& dc, const DisassemblyLineInfo &line, int x, int y, wxColor& textColor, - const std::set ¤tArguments); - void assembleOpcode(u32 address, std::string defaultText); - int getBackgroundColor(unsigned int address); - - void postEvent(wxEventType type, wxString text); - void postEvent(wxEventType type, int value); - - void onPopupClick(wxCommandEvent& evt); - - void setCurAddress(u32 newAddress, bool extend = false) - { - newAddress = manager.getStartAddress(newAddress); - u32 after = manager.getNthNextAddress(newAddress,1); - curAddress = newAddress; - selectRangeStart = extend ? std::min(selectRangeStart, newAddress) : newAddress; - selectRangeEnd = extend ? std::max(selectRangeEnd, after) : after; - updateStatusBarText(); - } - - void scrollAddressIntoView(); - struct { - int addressStart; - int opcodeStart; - int argumentsStart; - int arrowsStart; - } pixelPositions; - - DebugInterface* cpu; - DisassemblyManager manager; - u32 windowStart; - u32 curAddress; - u32 selectRangeStart; - u32 selectRangeEnd; - int visibleRows; - int rowHeight; - int charWidth; - bool displaySymbols; - std::vector jumpStack; - - wxIcon bpEnabled,bpDisabled; - wxMenu menu; -}; diff --git a/pcsx2/gui/Debugger/CtrlMemSearch.cpp b/pcsx2/gui/Debugger/CtrlMemSearch.cpp deleted file mode 100644 index 8937c1f153..0000000000 --- a/pcsx2/gui/Debugger/CtrlMemSearch.cpp +++ /dev/null @@ -1,512 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "CtrlMemSearch.h" -#include "DebugTools/Debug.h" -#include "gui/AppConfig.h" -#include "common/BitCast.h" -#include "common/StringUtil.h" -#include "Patch.h" // Required for SwapEndian :( - - -#include "BreakpointWindow.h" -#include "DebugEvents.h" -#include "DisassemblyDialog.h" -#include -#include - -wxDEFINE_EVENT(pxEvt_SearchFinished, wxCommandEvent); - -wxBEGIN_EVENT_TABLE(CtrlMemSearch, wxWindow) - EVT_SET_FOCUS(CtrlMemSearch::focusEvent) - EVT_KILL_FOCUS(CtrlMemSearch::focusEvent) - EVT_SIZE(CtrlMemSearch::sizeEvent) -wxEND_EVENT_TABLE() - -enum MemoryViewMenuIdentifiers { - ID_MEMVIEW_GOTOINDISASM = 1, - ID_MEMVIEW_GOTOADDRESS, - ID_MEMVIEW_COPYADDRESS, - ID_MEMVIEW_FOLLOWADDRESS, - ID_MEMVIEW_DISPLAYVALUE_8, - ID_MEMVIEW_DISPLAYVALUE_16, - ID_MEMVIEW_DISPLAYVALUE_32, - ID_MEMVIEW_DISPLAYVALUE_64, - ID_MEMVIEW_DISPLAYVALUE_128, - ID_MEMVIEW_COPYVALUE_8, - ID_MEMVIEW_COPYVALUE_16, - ID_MEMVIEW_COPYVALUE_32, - ID_MEMVIEW_COPYVALUE_64, - ID_MEMVIEW_COPYVALUE_128, - ID_MEMVIEW_ALIGNWINDOW, -}; - -// Kind of lame, but it works. -const wxString wxStringTypes[] = - { - "Byte", - "2 Bytes", - "4 Bytes", - "8 Bytes", - "Float", - "Double", - "String"}; -const wxArrayString SearchTypes = wxArrayString(7, wxStringTypes); - -// StringUtils::FromChars doesn't appreciate the leading 0x. -__fi wxString CheckHexadecimalString(wxString s) -{ - if(s.StartsWith("0x")) - return s.Remove(0, 2); - return s; -} - -CtrlMemSearch::CtrlMemSearch(wxWindow* parent, DebugInterface* _cpu) - : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) - , cpu(_cpu) -{ - - m_SearchThread.reset(new SearchThread(this, _cpu)); - m_SearchThread->SetName("Debugger Memory Search"); - - Bind(pxEvt_SearchFinished, &CtrlMemSearch::onSearchFinished, this); - - wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); - - txtSearch = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, -1)); - btnSearch = new wxButton(this, wxID_ANY, L"Search", wxDefaultPosition); - - Bind(wxEVT_BUTTON, &CtrlMemSearch::Search, this, btnSearch->GetId()); - - cmbSearchType = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, -1), 0, NULL, wxCB_READONLY); - cmbSearchType->Set(SearchTypes); - cmbSearchType->SetSelection(0); - - Bind(wxEVT_COMBOBOX, &CtrlMemSearch::onSearchTypeChanged, this, cmbSearchType->GetId()); - - chkHexadecimal = new wxCheckBox(this, wxID_ANY, L"Hex"); - chkHexadecimal->SetValue(true); - - radBigEndian = new wxRadioButton(this, wxID_ANY, L"Big Endian", wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - radLittleEndian = new wxRadioButton(this, wxID_ANY, L"Little Endian"); - radLittleEndian->SetValue(true); - - txtMemoryStart = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, -1)); - txtMemoryStart->SetValue(L"0x0"); - txtMemoryEnd = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, -1)); - if (_cpu->getCpuType() == BREAKPOINT_EE) - txtMemoryEnd->SetValue(L"0x200000"); - else - txtMemoryEnd->SetValue(L"0x20000"); - - lblSearchHits = new wxStaticText(this, wxID_ANY, L"Hits: 0"); - lblSearchHitSelected = new wxStaticText(this, wxID_ANY, L"Cur: 0"); - - btnNext = new wxButton(this, wxID_ANY, L"Next", wxDefaultPosition); - btnNext->Enable(false); - Bind(wxEVT_BUTTON, &CtrlMemSearch::onSearchNext, this, btnNext->GetId()); - btnPrev = new wxButton(this, wxID_ANY, L"Prev", wxDefaultPosition); - btnPrev->Enable(false); - Bind(wxEVT_BUTTON, &CtrlMemSearch::onSearchPrev, this, btnPrev->GetId()); - - // GUI design - - // Search box and search button - wxBoxSizer* searchSizer = new wxBoxSizer(wxHORIZONTAL); - searchSizer->Add(txtSearch, 0); - searchSizer->Add(btnSearch, 0, wxLEFT, 5); - - mainSizer->Add(searchSizer, 0, wxUP | wxLEFT | wxRIGHT, 5); - - // Search type combo box and hexadecimal checkbox - wxBoxSizer* searchTypeSizer = new wxBoxSizer(wxHORIZONTAL); - searchTypeSizer->Add(cmbSearchType, 0, wxEXPAND); - searchTypeSizer->Add(chkHexadecimal, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, 5); - - mainSizer->Add(searchTypeSizer, 0, wxUP | wxLEFT | wxRIGHT, 5); - - // Big / Little Endianess radio button - wxBoxSizer* endianessSizer = new wxBoxSizer(wxHORIZONTAL); - endianessSizer->Add(radLittleEndian, 0, wxALIGN_CENTER_VERTICAL); - endianessSizer->Add(radBigEndian, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, 5); - - mainSizer->Add(endianessSizer, 0, wxUP | wxLEFT | wxRIGHT, 5); - - // Address range type text boxes - wxFlexGridSizer* addrRangeSizer = new wxFlexGridSizer(2, 2, 5); - - addrRangeSizer->Add(new wxStaticText(this, wxID_ANY, L"Start Address"), 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - addrRangeSizer->Add(txtMemoryStart, 0, wxEXPAND); - - addrRangeSizer->Add(new wxStaticText(this, wxID_ANY, L"End Address"), 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - addrRangeSizer->Add(txtMemoryEnd, 0, wxEXPAND); - - mainSizer->Add(addrRangeSizer, 0, wxUP | wxLEFT | wxRIGHT, 5); - - wxBoxSizer* resultSizer = new wxBoxSizer(wxHORIZONTAL); - resultSizer->Add(lblSearchHits, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5); - resultSizer->Add(lblSearchHitSelected, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5); - resultSizer->Add(btnPrev, 0, wxRIGHT, 5); - resultSizer->Add(btnNext, 0, wxRIGHT, 5); - - mainSizer->Add(resultSizer, 0, wxUP | wxLEFT | wxRIGHT, 5); - this->SetSizer(mainSizer); - SetDoubleBuffered(true); -} - -void CtrlMemSearch::postEvent(wxEventType type, wxString text) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetClientData(cpu); - event.SetString(text); - wxPostEvent(this, event); -} - -void CtrlMemSearch::postEvent(wxEventType type, int value) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetClientData(cpu); - event.SetInt(value); - wxPostEvent(this, event); -} - -// Set up the thread with out UI params -// Then execute the thread -void CtrlMemSearch::Search(wxCommandEvent& evt) -{ - if (!m_searchResultsMutex.try_lock()) - { - // Uh, if it doesn't lock then means we somehow tried to search while - // the search was still running. - return; - } - m_searchResults.clear(); - m_searchResultsMutex.unlock(); - - lblSearchHits->SetLabelText(L"Hits: 0"); - btnNext->Enable(false); - btnPrev->Enable(false); - - u64 startAddress = 0; - u64 endAddress = 0; - - const auto resStart = StringUtil::FromChars(CheckHexadecimalString(txtMemoryStart->GetValue()).ToStdString(), 16); - if (!resStart.has_value()) - { - wxMessageBox(L"Invalid start address", L"Error", wxOK | wxICON_ERROR); - return; - } - startAddress = resStart.value(); - - const auto resEnd = StringUtil::FromChars(CheckHexadecimalString(txtMemoryEnd->GetValue()).ToStdString(), 16); - if (!resStart.has_value()) - { - wxMessageBox(L"Invalid end address", L"Error", wxOK | wxICON_ERROR); - return; - } - endAddress = resEnd.value(); - - m_SearchThread->m_start = startAddress; - m_SearchThread->m_end = endAddress; - m_SearchThread->m_type = static_cast(cmbSearchType->GetSelection()); - - // Prepare the search value for the thread - - wxString searchString = txtSearch->GetValue(); - if (m_SearchThread->m_type == SEARCHTYPE::STRING) - { - m_SearchThread->m_value_string = searchString.ToUTF8(); - } - else if (chkHexadecimal->IsChecked()) - { - const auto res = StringUtil::FromChars(CheckHexadecimalString(txtSearch->GetValue()).ToStdString(), 16); - if (!res.has_value()) - { - wxMessageBox(L"Invalid hexadecimal value", L"Error", wxOK | wxICON_ERROR); - return; - } - m_SearchThread->m_value = radBigEndian->GetValue() ? SwapEndian(res.value(), SEARCHTYPEBITS[cmbSearchType->GetSelection()]) : res.value(); - } - else - { - // According to my logic, we end up here if we aren't searching for a string - // Aren't in hexadecimal mode. - - // Let's check if we're searching for a signed or unsigned value - // The thread will handle the interpretation for us. - m_SearchThread->m_signed = txtSearch->GetValue().First('-'); - - // Now we can convert the string to a number - - if (m_SearchThread->m_type == SEARCHTYPE::FLOAT || m_SearchThread->m_type == SEARCHTYPE::DOUBLE) - { - // We're searching for a float or double, so we need to convert the string to a double - const auto res = StringUtil::FromChars(txtSearch->GetValue().ToStdString()); - if (!res.has_value()) - { - wxMessageBox(L"Invalid floating point value", L"Error", wxOK | wxICON_ERROR); - return; - } - - if (m_SearchThread->m_type == SEARCHTYPE::FLOAT) - { - const u32 u32SearchValue = bit_cast(res.value()); - m_SearchThread->m_value = u32SearchValue; - } - else - { - const u64 u64SearchValue = bit_cast(res.value()); - m_SearchThread->m_value = u64SearchValue; - } - } - else - { - // We're searching for either a BYTE, WORD, DWORD or QWORD - - const auto res = StringUtil::FromChars(txtSearch->GetValue().ToStdString()); - if(!res.has_value()) - { - wxMessageBox(L"Invalid decimal search value", L"Error", wxOK | wxICON_ERROR); - return; - } - - // We don't need to bitcast here, because the thread already has the correct value type of u64 - m_SearchThread->m_value = radBigEndian->GetValue() ? SwapEndian(res.value(), SEARCHTYPEBITS[cmbSearchType->GetSelection()]) : res.value(); - } - } - - m_SearchThread->Start(); -}; - -void CtrlMemSearch::onSearchFinished(wxCommandEvent& evt) -{ - // We're done searching, so let's update the UI - - m_searchResultsMutex.lock(); - - lblSearchHits->SetLabelText(wxString::Format(L"Hits: %zu", m_searchResults.size())); - - // Enable the buttons only if we have results - // -1 indicates we haven't jumped to a result yet - m_searchIter = -1; - lblSearchHitSelected->SetLabelText(L"Cur: 0"); - btnNext->Enable(m_searchResults.size() > 0); - btnPrev->Enable(m_searchResults.size() > 0); - - m_searchResultsMutex.unlock(); - - this->Layout(); // This makes sure the search hit count label doesn't get cut off -} - -void CtrlMemSearch::onSearchNext(wxCommandEvent& evt) -{ - m_searchIter++; - if (m_searchIter == m_searchResults.size()) - { - m_searchIter = 0; - } - - lblSearchHitSelected->SetLabelText(wxString::Format(L"Cur: %d",m_searchIter + 1)); - this->Layout(); - postEvent(debEVT_GOTOINMEMORYVIEW, m_searchResults[m_searchIter]); -} - -void CtrlMemSearch::onSearchPrev(wxCommandEvent& evt) -{ - m_searchIter--; - // Unsigned underflow - if (m_searchIter > m_searchResults.size()) - { - m_searchIter = m_searchResults.size() - 1; - } - - lblSearchHitSelected->SetLabelText(wxString::Format(L"Cur: %d",m_searchIter + 1)); - this->Layout(); - postEvent(debEVT_GOTOINMEMORYVIEW, m_searchResults[m_searchIter]); -} - -void CtrlMemSearch::onSearchTypeChanged(wxCommandEvent& evt) -{ - // Update the search value text box to match the search type - switch (static_cast(cmbSearchType->GetSelection())) - { - case SEARCHTYPE::BYTE: - case SEARCHTYPE::WORD: - case SEARCHTYPE::DWORD: - case SEARCHTYPE::QWORD: - radBigEndian->Enable(true); - radLittleEndian->Enable(true); - chkHexadecimal->Enable(true); - break; - case SEARCHTYPE::FLOAT: - case SEARCHTYPE::DOUBLE: - case SEARCHTYPE::STRING: - radBigEndian->Enable(false); - radLittleEndian->Enable(false); - chkHexadecimal->Enable(false); - chkHexadecimal->SetValue(false); - break; - } -} - -// -- SearchThread - -// There might be a prettier way to read from the vtlb -template -void memSearch(std::vector& out, u32 start, u32 end, T value, DebugInterface* cpu) -{ - for (u32 addr = start; addr < end; addr += sizeof(T)) - { - if (!cpu->isValidAddress(addr)) - { - continue; - } - - T val = 0; - if (sizeof(T) == 1) - { - val = cpu->read8(addr); - } - else if (sizeof(T) == 2) - { - val = cpu->read16(addr); - } - else if (sizeof(T) == 4) - { - if (std::is_same::value) - { - float fpVal = bit_cast(value); - // Love floating point - if (bit_cast(cpu->read32(addr)) < fpVal + 0.001f && bit_cast(cpu->read32(addr)) > fpVal - 0.001f) - { - out.push_back(addr); - } - continue; - } - - val = cpu->read32(addr); - } - else if (sizeof(T) == 8) - { - if (std::is_same::value) - { - double dbVal = bit_cast(value); - if (bit_cast(cpu->read64(addr)) < dbVal + 0.001 && bit_cast(cpu->read64(addr)) > dbVal - 0.001) - { - out.push_back(addr); - } - continue; - } - - val = cpu->read64(addr); - } - - if (val == value) - { - out.push_back(addr); - } - } -} - -void SearchThread::ExecuteTaskInThread() -{ - // First, make sure we can lock the mutex - if (!m_parent->m_searchResultsMutex.try_lock()) - { - // We couldn't lock the mutex, this thread either didn't unlock, or we've somehow raced - // with the main UI thread ? - assert("Failed to lock our memory search mutex?"); - return; - } - - switch (m_type) - { - case SEARCHTYPE::BYTE: - if (m_signed) - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - else - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - break; - case SEARCHTYPE::WORD: - if (m_signed) - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - else - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - break; - case SEARCHTYPE::DWORD: - if (m_signed) - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - else - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - break; - case SEARCHTYPE::QWORD: - if (m_signed) - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - else - { - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - } - break; - case SEARCHTYPE::FLOAT: - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - break; - case SEARCHTYPE::DOUBLE: - memSearch(m_parent->m_searchResults, m_start, m_end, m_value, m_cpu); - break; - case SEARCHTYPE::STRING: - for (u32 addr = m_start; addr < m_end; addr++) - { - // There is no easy way to do this with the vtable. - bool match = true; - for (u32 stringIndex = 0; stringIndex < m_value_string.size(); stringIndex++) - { - if ((char)m_cpu->read8(addr + stringIndex) != m_value_string[stringIndex]) - { - match = false; - break; - } - } - - if (match) - { - m_parent->m_searchResults.push_back(addr); - addr += m_value_string.size() - 1; - } - } - break; - } - - m_parent->m_searchResultsMutex.unlock(); - - wxCommandEvent done(pxEvt_SearchFinished); - m_parent->GetEventHandler()->AddPendingEvent(done); -} diff --git a/pcsx2/gui/Debugger/CtrlMemSearch.h b/pcsx2/gui/Debugger/CtrlMemSearch.h deleted file mode 100644 index 7411ac73d4..0000000000 --- a/pcsx2/gui/Debugger/CtrlMemSearch.h +++ /dev/null @@ -1,109 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include -#include "DebugTools/DebugInterface.h" -#include "DebugTools/DisassemblyManager.h" -#include "gui/PersistentThread.h" - -enum class SEARCHTYPE -{ - BYTE, - WORD, - DWORD, - QWORD, - FLOAT, - DOUBLE, - STRING, -}; - -class CtrlMemSearch; - -class SearchThread : public Threading::pxThread -{ - CtrlMemSearch* m_parent; - DebugInterface* m_cpu; -public: - virtual ~SearchThread() - { - try - { - pxThread::Cancel(); - } - DESTRUCTOR_CATCHALL - } - SearchThread(CtrlMemSearch* parent, DebugInterface* cpu) { m_parent = parent; m_cpu = cpu; }; - - SEARCHTYPE m_type; - // Only guaranteed to be valid if m_type == STRING - std::string m_value_string; - u64 m_value; - bool m_signed; - u64 m_start,m_end; -protected: - void ExecuteTaskInThread(); -}; - -class CtrlMemSearch : public wxWindow -{ -public: - CtrlMemSearch(wxWindow* parent, DebugInterface* _cpu); - - std::vector m_searchResults; - std::mutex m_searchResultsMutex; - wxDECLARE_EVENT_TABLE(); - - -private: - void setRowSize(int bytesInRow); - void postEvent(wxEventType type, wxString text); - void postEvent(wxEventType type, int value); - void onPopupClick(wxCommandEvent& evt); - void focusEvent(wxFocusEvent& evt) { Refresh(); }; - void sizeEvent(wxSizeEvent& evt) - { - // Why in the world do I have to do this. - // Without this the window isn't redrawn during a size event - Refresh(); // Reloads the window, fixes the imporper drawing but ruins the layout - Layout(); // Fix the layout of the window - }; - void onSearchFinished(wxCommandEvent& evt); - void onSearchNext(wxCommandEvent& evt); - void onSearchPrev(wxCommandEvent& evt); - void onSearchTypeChanged(wxCommandEvent& evt); - - void Search(wxCommandEvent& evt); - const u8 SEARCHTYPEBITS[8] = {8,16,32,64,32,64,0}; - - DebugInterface* cpu; - wxFont font, underlineFont; - wxTextCtrl* txtSearch; - wxButton* btnSearch; - wxComboBox* cmbSearchType; - wxCheckBox* chkHexadecimal; - wxTextCtrl* txtMemoryStart; - wxTextCtrl* txtMemoryEnd; - wxRadioButton* radBigEndian; - wxRadioButton* radLittleEndian; - wxStaticText* lblSearchHits; - wxStaticText* lblSearchHitSelected; - wxButton* btnNext; - wxButton* btnPrev; - - u64 m_searchIter = -1; - std::unique_ptr m_SearchThread; - wxMenu menu; -}; diff --git a/pcsx2/gui/Debugger/CtrlMemView.cpp b/pcsx2/gui/Debugger/CtrlMemView.cpp deleted file mode 100644 index 7bb1e0e5c9..0000000000 --- a/pcsx2/gui/Debugger/CtrlMemView.cpp +++ /dev/null @@ -1,830 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "CtrlMemView.h" -#include "DebugTools/Debug.h" -#include "gui/AppConfig.h" - -#include "BreakpointWindow.h" -#include "DebugEvents.h" -#include "DisassemblyDialog.h" -#include -#include - - -wxBEGIN_EVENT_TABLE(CtrlMemView, wxWindow) - EVT_PAINT(CtrlMemView::paintEvent) - EVT_MOUSEWHEEL(CtrlMemView::mouseEvent) - EVT_LEFT_DOWN(CtrlMemView::mouseEvent) - EVT_LEFT_DCLICK(CtrlMemView::mouseEvent) - EVT_RIGHT_DOWN(CtrlMemView::mouseEvent) - EVT_RIGHT_UP(CtrlMemView::mouseEvent) - EVT_KEY_DOWN(CtrlMemView::keydownEvent) - EVT_CHAR(CtrlMemView::charEvent) - EVT_SET_FOCUS(CtrlMemView::focusEvent) - EVT_KILL_FOCUS(CtrlMemView::focusEvent) - EVT_SCROLLWIN_LINEUP(CtrlMemView::scrollbarEvent) - EVT_SCROLLWIN_LINEDOWN(CtrlMemView::scrollbarEvent) - EVT_SCROLLWIN_PAGEUP(CtrlMemView::scrollbarEvent) - EVT_SCROLLWIN_PAGEDOWN(CtrlMemView::scrollbarEvent) -wxEND_EVENT_TABLE() - -enum MemoryViewMenuIdentifiers -{ - ID_MEMVIEW_GOTOINDISASM = 1, - ID_MEMVIEW_GOTOADDRESS, - ID_MEMVIEW_COPYADDRESS, - ID_MEMVIEW_FOLLOWADDRESS, - ID_MEMVIEW_DISPLAYVALUE_8, - ID_MEMVIEW_DISPLAYVALUE_16, - ID_MEMVIEW_DISPLAYVALUE_32, - ID_MEMVIEW_DISPLAYVALUE_64, - ID_MEMVIEW_DISPLAYVALUE_128, - ID_MEMVIEW_COPYVALUE_8, - ID_MEMVIEW_COPYVALUE_16, - ID_MEMVIEW_COPYVALUE_32, - ID_MEMVIEW_COPYVALUE_64, - ID_MEMVIEW_COPYVALUE_128, - ID_MEMVIEW_ALIGNWINDOW, -}; - -CtrlMemView::CtrlMemView(wxWindow* parent, DebugInterface* _cpu) - : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxVSCROLL) - , cpu(_cpu) -{ - rowHeight = getDebugFontHeight(); - charWidth = getDebugFontWidth(); - windowStart = 0x480000; - curAddress = windowStart; - byteGroupSize = 1; - - asciiSelected = false; - selectedNibble = 0; - addressStart = charWidth; - hexStart = addressStart + 9 * charWidth; - - setRowSize(g_Conf->EmuOptions.Debugger.MemoryViewBytesPerRow); - - font = pxGetFixedFont(8); - underlineFont = pxGetFixedFont(8, wxFONTWEIGHT_NORMAL, true); - font.SetPixelSize(wxSize(charWidth, rowHeight)); - underlineFont.SetPixelSize(wxSize(charWidth, rowHeight)); - - menu.Append(ID_MEMVIEW_GOTOINDISASM, L"Go to in Disasm"); - menu.Append(ID_MEMVIEW_GOTOADDRESS, L"Go to address"); - menu.Append(ID_MEMVIEW_COPYADDRESS, L"Copy address"); - menu.Append(ID_MEMVIEW_FOLLOWADDRESS, L"Follow address"); - menu.AppendSeparator(); - menu.AppendRadioItem(ID_MEMVIEW_DISPLAYVALUE_8, L"Display as 1 byte"); - menu.AppendRadioItem(ID_MEMVIEW_DISPLAYVALUE_16, L"Display as 2 byte"); - menu.AppendRadioItem(ID_MEMVIEW_DISPLAYVALUE_32, L"Display as 4 byte"); - menu.AppendRadioItem(ID_MEMVIEW_DISPLAYVALUE_64, L"Display as 8 byte"); - menu.AppendRadioItem(ID_MEMVIEW_DISPLAYVALUE_128, L"Display as 16 byte"); - menu.Check(ID_MEMVIEW_DISPLAYVALUE_8, true); - menu.AppendSeparator(); - menu.Append(ID_MEMVIEW_COPYVALUE_8, L"Copy Value (8 bit)"); - menu.Append(ID_MEMVIEW_COPYVALUE_16, L"Copy Value (16 bit)"); - menu.Append(ID_MEMVIEW_COPYVALUE_32, L"Copy Value (32 bit)"); - menu.Append(ID_MEMVIEW_COPYVALUE_64, L"Copy Value (64 bit)"); - menu.Append(ID_MEMVIEW_COPYVALUE_128, L"Copy Value (128 bit)"); - menu.AppendSeparator(); - menu.AppendCheckItem(ID_MEMVIEW_ALIGNWINDOW, L"Align window to row size"); - menu.Check(ID_MEMVIEW_ALIGNWINDOW, g_Conf->EmuOptions.Debugger.AlignMemoryWindowStart); - menu.Bind(wxEVT_MENU, &CtrlMemView::onPopupClick, this); - - SetScrollbar(wxVERTICAL, 100, 1, 201, true); - SetDoubleBuffered(true); -} - -void CtrlMemView::setRowSize(int bytesInRow) -{ - rowSize = (std::max(16, std::min(256, bytesInRow)) / 16) * 16; - asciiStart = hexStart + (rowSize * 3 + 1) * charWidth; -} - -void CtrlMemView::postEvent(wxEventType type, wxString text) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetClientData(cpu); - event.SetString(text); - wxPostEvent(this, event); -} - -void CtrlMemView::postEvent(wxEventType type, int value) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetClientData(cpu); - event.SetInt(value); - wxPostEvent(this, event); -} - -void CtrlMemView::paintEvent(wxPaintEvent& evt) -{ - wxPaintDC dc(this); - render(dc); -} - -void CtrlMemView::redraw() -{ - wxClientDC dc(this); - render(dc); -} - -int CtrlMemView::hexGroupPositionFromIndex(int idx) -{ - int groupPos = idx * charWidth * 2; - - int space = (charWidth / 4); - - // spaces after every byte - groupPos += idx * space; - - // spaces after every 2 bytes - groupPos += (idx / 2) * space; - - // spaces after every 4 bytes - return groupPos + (idx / 4) * space; -} - -void CtrlMemView::render(wxDC& dc) -{ - bool hasFocus = wxWindow::FindFocus() == this; - int visibleRows = GetClientSize().y / rowHeight; - - const wxColor COLOR_WHITE = wxColor(0xFFFFFFFF); - const wxColor COLOR_BLACK = wxColor(0xFF000000); - const wxColor COLOR_SELECTED_BG = wxColor(0xFFFF9933); - const wxColor COLOR_SELECTED_INACTIVE_BG = wxColor(0xFFC0C0C0); - const wxColor COLOR_REFRENCE_BG = wxColor(0xFFFFCFC8); - const wxColor COLOR_ADDRESS = wxColor(0xFF600000); - const wxColor COLOR_DELIMETER = wxColor(0xFFC0C0C0); - - dc.SetBrush(wxBrush(COLOR_WHITE)); - dc.SetPen(wxPen(COLOR_WHITE)); - - int width, height; - dc.GetSize(&width, &height); - dc.DrawRectangle(0, 0, width, height); - - const int TEMP_SIZE = 64; - wchar_t temp[TEMP_SIZE]; - - bool validCpu = cpu && cpu->isAlive(); - - // not hexGroupPositionFromIndex(byteGroupSize), because we dont need space after last symbol; - int groupWidth = hexGroupPositionFromIndex(byteGroupSize - 1) + charWidth * 2; - - for (int i = 0; i < visibleRows + 1; i++) - { - u32 rowAddress = windowStart + i * rowSize; - int rowY = rowHeight * i; - - swprintf(temp, TEMP_SIZE, L"%08X", rowAddress); - dc.SetFont(font); - dc.SetTextForeground(COLOR_ADDRESS); - dc.DrawText(temp, addressStart, rowY); - - for (int j = 0; j < rowSize; j++) - { - u32 byteAddress = rowAddress + j; - u8 byteCurrent = 0; - bool byteValid = false; - - try - { - byteValid = validCpu && cpu->isValidAddress(byteAddress); - - if (byteValid) - byteCurrent = cpu->read8(byteAddress); - } - catch (Exception::Ps2Generic&) - { - byteValid = false; - } - - // not optimized way, but more flexible than previous - - // calculate group position - int groupNum = j / byteGroupSize; - int groupPosX = hexStart + groupNum * byteGroupSize * 3 * charWidth; - - // calculate symbol position in group - int groupIndex = j % byteGroupSize; - - int symbolPosX = groupPosX + hexGroupPositionFromIndex(byteGroupSize - groupIndex - 1); - - u32 groupAddress = byteAddress - groupIndex; - - bool backgroundIsDark = false; - if (curAddress >= groupAddress && curAddress < groupAddress + byteGroupSize) - { - // if group selected, draw rectangle behind - if (groupIndex == 0) - { - if (hasFocus && !asciiSelected) - { - dc.SetPen(COLOR_SELECTED_BG); - dc.SetBrush(COLOR_SELECTED_BG); - } - else - { - dc.SetPen(COLOR_SELECTED_INACTIVE_BG); - dc.SetBrush(COLOR_SELECTED_INACTIVE_BG); - } - - dc.DrawRectangle(groupPosX, rowY, groupWidth, rowHeight); - } - - backgroundIsDark = hasFocus && !asciiSelected; - } - if (groupAddress + groupIndex == referencedAddress) - { - dc.SetPen(COLOR_REFRENCE_BG); - dc.SetBrush(COLOR_REFRENCE_BG); - dc.DrawRectangle(symbolPosX, rowY, charWidth * 2, rowHeight); - backgroundIsDark = false; - } - - dc.SetTextForeground(backgroundIsDark ? COLOR_WHITE : COLOR_BLACK); - - swprintf(temp, TEMP_SIZE, byteValid ? L"%02X" : L"??", byteCurrent); - // if selected byte, need hint current nibble - if (byteAddress == curAddress) - { - if (selectedNibble == 1) - dc.SetFont(underlineFont); - - dc.DrawText(temp + 1, symbolPosX + charWidth, rowY); - - if (selectedNibble == 1) - dc.SetFont(font); - else - dc.SetFont(underlineFont); - - temp[1] = 0; - dc.DrawText(temp, symbolPosX, rowY); - - if (selectedNibble == 0) - dc.SetFont(font); - } - else - { - dc.DrawText(temp, symbolPosX, rowY); - } - - // draw in ansii text representation table - temp[1] = 0; - temp[0] = (!byteValid || byteCurrent < 32 || byteCurrent > 128) ? '.' : byteCurrent; - - if (byteAddress == curAddress) - { - if (hasFocus && asciiSelected) - { - dc.SetPen(COLOR_SELECTED_BG); - dc.SetBrush(COLOR_SELECTED_BG); - dc.SetTextForeground(COLOR_WHITE); - } - else - { - dc.SetPen(COLOR_SELECTED_INACTIVE_BG); - dc.SetBrush(COLOR_SELECTED_INACTIVE_BG); - dc.SetTextForeground(COLOR_BLACK); - } - dc.DrawRectangle(asciiStart + j * (charWidth + 2), rowY, charWidth, rowHeight); - } - else - { - dc.SetTextForeground(COLOR_BLACK); - } - - dc.DrawText(temp, asciiStart + j * (charWidth + 2), rowY); - } - } - - dc.SetPen(COLOR_DELIMETER); - dc.SetBrush(COLOR_DELIMETER); - int linestep = std::max((u32)4, byteGroupSize); - for (int i = linestep; i < rowSize; i += linestep) - { - int x = hexStart + i * 3 * charWidth - charWidth / 2; - int y = (visibleRows + 1) * rowHeight; - dc.DrawLine(x, 0, x, y); - } -} - -void CtrlMemView::onPopupClick(wxCommandEvent& evt) -{ - wchar_t str[64]; - - switch (evt.GetId()) - { - case ID_MEMVIEW_COPYADDRESS: - if (wxTheClipboard->Open()) - { - swprintf(str, 64, L"%08X", curAddress); - wxTheClipboard->SetData(new wxTextDataObject(str)); - wxTheClipboard->Close(); - } - break; - case ID_MEMVIEW_GOTOINDISASM: - postEvent(debEVT_GOTOINDISASM, curAddress); - break; - case ID_MEMVIEW_GOTOADDRESS: - postEvent(debEVT_GOTOADDRESS, curAddress); - break; - case ID_MEMVIEW_FOLLOWADDRESS: - gotoAddress(cpu->read32(curAddress), true); - break; - case ID_MEMVIEW_DISPLAYVALUE_8: - byteGroupSize = 1; - Refresh(); - break; - case ID_MEMVIEW_DISPLAYVALUE_16: - byteGroupSize = 2; - Refresh(); - break; - case ID_MEMVIEW_DISPLAYVALUE_32: - byteGroupSize = 4; - Refresh(); - break; - case ID_MEMVIEW_DISPLAYVALUE_64: - byteGroupSize = 8; - Refresh(); - break; - case ID_MEMVIEW_DISPLAYVALUE_128: - byteGroupSize = 16; - Refresh(); - break; - case ID_MEMVIEW_COPYVALUE_8: - if (wxTheClipboard->Open()) - { - swprintf(str, 64, L"%02X", cpu->read8(curAddress)); - wxTheClipboard->SetData(new wxTextDataObject(str)); - wxTheClipboard->Close(); - } - break; - case ID_MEMVIEW_COPYVALUE_16: - if (wxTheClipboard->Open()) - { - swprintf(str, 64, L"%04X", cpu->read16(curAddress)); - wxTheClipboard->SetData(new wxTextDataObject(str)); - wxTheClipboard->Close(); - } - break; - case ID_MEMVIEW_COPYVALUE_32: - if (wxTheClipboard->Open()) - { - swprintf(str, 64, L"%08X", cpu->read32(curAddress)); - wxTheClipboard->SetData(new wxTextDataObject(str)); - wxTheClipboard->Close(); - } - break; - case ID_MEMVIEW_COPYVALUE_64: - if (wxTheClipboard->Open()) - { - swprintf(str, 64, L"%016llX", cpu->read64(curAddress)); - wxTheClipboard->SetData(new wxTextDataObject(str)); - wxTheClipboard->Close(); - } - break; - case ID_MEMVIEW_COPYVALUE_128: - if (wxTheClipboard->Open()) - { - u128 value = cpu->read128(curAddress); - swprintf(str, 64, L"%016llX%016llX", value._u64[1], value._u64[0]); - wxTheClipboard->SetData(new wxTextDataObject(str)); - wxTheClipboard->Close(); - } - break; - case ID_MEMVIEW_ALIGNWINDOW: - g_Conf->EmuOptions.Debugger.AlignMemoryWindowStart = evt.IsChecked(); - if (g_Conf->EmuOptions.Debugger.AlignMemoryWindowStart) - { - windowStart -= windowStart % rowSize; - redraw(); - } - break; - } -} - -void CtrlMemView::mouseEvent(wxMouseEvent& evt) -{ - // left button - if (evt.GetEventType() == wxEVT_LEFT_DOWN || evt.GetEventType() == wxEVT_LEFT_DCLICK || evt.GetEventType() == wxEVT_RIGHT_DOWN || evt.GetEventType() == wxEVT_RIGHT_DCLICK) - { - gotoPoint(evt.GetPosition().x, evt.GetPosition().y); - SetFocus(); - SetFocusFromKbd(); - } - else if (evt.GetEventType() == wxEVT_RIGHT_UP) - { - curAddress -= (curAddress - windowStart) % byteGroupSize; - - menu.Enable(ID_MEMVIEW_FOLLOWADDRESS, (curAddress & 3) == 0); - - menu.Check(ID_MEMVIEW_DISPLAYVALUE_8, byteGroupSize == 1); - menu.Check(ID_MEMVIEW_DISPLAYVALUE_16, byteGroupSize == 2); - menu.Check(ID_MEMVIEW_DISPLAYVALUE_32, byteGroupSize == 4); - menu.Check(ID_MEMVIEW_DISPLAYVALUE_64, byteGroupSize == 8); - menu.Check(ID_MEMVIEW_DISPLAYVALUE_128, byteGroupSize == 16); - - menu.Enable(ID_MEMVIEW_COPYVALUE_128, (curAddress & 15) == 0); - menu.Enable(ID_MEMVIEW_COPYVALUE_64, (curAddress & 7) == 0); - menu.Enable(ID_MEMVIEW_COPYVALUE_32, (curAddress & 3) == 0); - menu.Enable(ID_MEMVIEW_COPYVALUE_16, (curAddress & 1) == 0); - - menu.Check(ID_MEMVIEW_ALIGNWINDOW, g_Conf->EmuOptions.Debugger.AlignMemoryWindowStart); - - PopupMenu(&menu); - return; - } - else if (evt.GetEventType() == wxEVT_MOUSEWHEEL) - { - if (evt.ControlDown()) - { - if (evt.GetWheelRotation() > 0) - { - setRowSize(rowSize + 16); - } - else - { - setRowSize(rowSize - 16); - } - } - else - { - if (evt.GetWheelRotation() > 0) - { - scrollWindow(-3); - } - else if (evt.GetWheelRotation() < 0) - { - scrollWindow(3); - } - } - } - else - { - evt.Skip(); - return; - } - - redraw(); -} - -void CtrlMemView::keydownEvent(wxKeyEvent& evt) -{ - if (evt.ControlDown()) - { - switch (evt.GetKeyCode()) - { - case 'g': - case 'G': - { - u64 addr; - if (!executeExpressionWindow(this, cpu, addr)) - return; - - gotoAddress(addr, true); - } - break; - case 'b': - case 'B': - { - BreakpointWindow bpw(this, cpu); - if (bpw.ShowModal() == wxID_OK) - { - bpw.addBreakpoint(); - postEvent(debEVT_UPDATE, 0); - } - } - break; - case 'v': - case 'V': - pasteHex(); - break; - default: - evt.Skip(); - break; - } - return; - } - - switch (evt.GetKeyCode()) - { - case 'g': - case 'G': - { - u64 addr; - if (!executeExpressionWindow(this, cpu, addr)) - return; - gotoAddress(addr, true); - } - break; - case WXK_LEFT: - scrollCursor(-1); - break; - case WXK_RIGHT: - scrollCursor(1); - break; - case WXK_UP: - scrollCursor(-rowSize); - break; - case WXK_DOWN: - scrollCursor(rowSize); - break; - case WXK_PAGEUP: - scrollWindow(-GetClientSize().y / rowHeight); - break; - case WXK_PAGEDOWN: - scrollWindow(GetClientSize().y / rowHeight); - break; - case WXK_ESCAPE: - if (!history.empty()) - { - gotoAddress(history.top()); - history.pop(); - } - break; - default: - evt.Skip(); - break; - } -} - -void CtrlMemView::charEvent(wxKeyEvent& evt) -{ - if (evt.GetKeyCode() < 32) - return; - - if (!cpu->isValidAddress(curAddress)) - { - scrollCursor(1); - return; - } - - bool active = !cpu->isCpuPaused(); - if (active) - cpu->pauseCpu(); - - if (asciiSelected) - { - u8 newValue = evt.GetKeyCode(); - cpu->write8(curAddress, newValue); - scrollCursor(1); - } - else - { - u8 key = tolower(evt.GetKeyCode()); - int inputValue = -1; - - if (key >= '0' && key <= '9') - inputValue = key - '0'; - if (key >= 'a' && key <= 'f') - inputValue = key - 'a' + 10; - - if (inputValue >= 0) - { - int shiftAmount = (1 - selectedNibble) * 4; - - u8 oldValue = cpu->read8(curAddress); - oldValue &= ~(0xF << shiftAmount); - u8 newValue = oldValue | (inputValue << shiftAmount); - cpu->write8(curAddress, newValue); - scrollCursor(1); - } - } - - if (active) - cpu->resumeCpu(); - redraw(); -} - -void CtrlMemView::scrollbarEvent(wxScrollWinEvent& evt) -{ - int type = evt.GetEventType(); - if (type == wxEVT_SCROLLWIN_LINEUP) - { - scrollCursor(-rowSize); - } - else if (type == wxEVT_SCROLLWIN_LINEDOWN) - { - scrollCursor(rowSize); - } - else if (type == wxEVT_SCROLLWIN_PAGEUP) - { - scrollWindow(-GetClientSize().y / rowHeight); - } - else if (type == wxEVT_SCROLLWIN_PAGEDOWN) - { - scrollWindow(GetClientSize().y / rowHeight); - } - - redraw(); -} - -void CtrlMemView::scrollWindow(int lines) -{ - windowStart += lines * rowSize; - curAddress += lines * rowSize; - redraw(); -} - -void CtrlMemView::scrollCursor(int bytes) -{ - if (!asciiSelected && bytes == 1) - { - if (selectedNibble == 0) - { - selectedNibble = 1; - bytes = 0; - } - else - { - selectedNibble = 0; - } - } - else if (!asciiSelected && bytes == -1) - { - if (selectedNibble == 0) - { - selectedNibble = 1; - } - else - { - selectedNibble = 0; - bytes = 0; - } - } - - curAddress += bytes; - - int visibleRows = GetClientSize().y / rowHeight; - u32 windowEnd = windowStart + visibleRows * rowSize; - - if (curAddress < windowStart) - { - windowStart = (curAddress / rowSize) * rowSize; - } - else if (curAddress >= windowEnd) - { - windowStart = curAddress - (visibleRows - 1) * rowSize; - windowStart = (windowStart / rowSize) * rowSize; - } - - updateStatusBarText(); - redraw(); -} - -void CtrlMemView::updateStatusBarText() -{ - wchar_t text[64]; - - int needpad = (curAddress - windowStart) % byteGroupSize; - u32 addr = curAddress - needpad; - - swprintf(text, 64, L"%08X %08X", curAddress, addr); - - postEvent(debEVT_SETSTATUSBARTEXT, text); -} - -void CtrlMemView::gotoAddress(u32 addr, bool pushInHistory) -{ - if (pushInHistory) - history.push(windowStart); - - curAddress = addr; - selectedNibble = 0; - - if (g_Conf->EmuOptions.Debugger.AlignMemoryWindowStart) - { - int visibleRows = GetClientSize().y / rowHeight; - u32 windowEnd = windowStart + visibleRows * rowSize; - - if (curAddress < windowStart || curAddress >= windowEnd) - windowStart = (curAddress / rowSize) * rowSize; - } - else - { - windowStart = curAddress; - } - - updateStatusBarText(); - redraw(); -} - -void CtrlMemView::gotoPoint(int x, int y) -{ - int line = y / rowHeight; - int lineAddress = windowStart + line * rowSize; - - if (x >= asciiStart) - { - int col = (x - asciiStart) / (charWidth + 2); - if (col >= rowSize) - return; - - asciiSelected = true; - curAddress = lineAddress + col; - selectedNibble = 0; - updateStatusBarText(); - redraw(); - } - else if (x >= hexStart) - { - int col = (x - hexStart); - - int groupWidth = byteGroupSize * charWidth * 3; - int group = col / groupWidth; - - int posInGroup = col % groupWidth; - - int indexInGroup = -1; - - for (int i = 0; i < int(byteGroupSize); i++) - { - int start = hexGroupPositionFromIndex(i); - int end = start + 2 * charWidth - 1; - if (posInGroup < start) - { - return; - } - else if (posInGroup <= end) - { - selectedNibble = ((posInGroup - start) / charWidth) % 2; - indexInGroup = i; - break; - } - } - - if (indexInGroup == -1) - return; - - curAddress = lineAddress + group * byteGroupSize + (byteGroupSize - indexInGroup - 1); - - asciiSelected = false; - updateStatusBarText(); - redraw(); - } -} - -void CtrlMemView::updateReference(u32 address) -{ - referencedAddress = address; - redraw(); -} - -void CtrlMemView::pasteHex() -{ - if (wxTheClipboard->Open()) - { - if (wxTheClipboard->IsSupported(wxDF_TEXT)) - { - wxTextDataObject data; - wxTheClipboard->GetData(data); - wxString str = data.GetText(); - str.Replace(" ", ""); - str.Replace("\n", ""); - str.Replace("\r", ""); - str.Replace("\t", ""); - - bool active = !cpu->isCpuPaused(); - if (active) - cpu->pauseCpu(); - - std::size_t i; - for (i = 0; i < str.size() / 2; i++) - { - long byte; - if (str.Mid(i * 2, 2).ToLong(&byte, 16)) - { - cpu->write8(curAddress + i, static_cast(byte)); - } - else - { - break; - } - } - scrollCursor(i); - - if (active) - cpu->resumeCpu(); - } - wxTheClipboard->Close(); - } -} diff --git a/pcsx2/gui/Debugger/CtrlMemView.h b/pcsx2/gui/Debugger/CtrlMemView.h deleted file mode 100644 index 775b7a12a3..0000000000 --- a/pcsx2/gui/Debugger/CtrlMemView.h +++ /dev/null @@ -1,69 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include - -#include "DebugTools/DebugInterface.h" -#include "DebugTools/DisassemblyManager.h" - -class CtrlMemView: public wxWindow -{ -public: - CtrlMemView(wxWindow* parent, DebugInterface* _cpu); - - void paintEvent(wxPaintEvent & evt); - void mouseEvent(wxMouseEvent& evt); - void keydownEvent(wxKeyEvent& evt); - void scrollbarEvent(wxScrollWinEvent& evt); - void charEvent(wxKeyEvent& evt); - void redraw(); - void gotoAddress(u32 address, bool pushInHistory = false); - void updateReference(u32 address); - - wxDECLARE_EVENT_TABLE(); -private: - void render(wxDC& dc); - int hexGroupPositionFromIndex(int idx); - void setRowSize(int bytesInRow); - void gotoPoint(int x, int y); - void updateStatusBarText(); - void postEvent(wxEventType type, wxString text); - void postEvent(wxEventType type, int value); - void scrollWindow(int lines); - void scrollCursor(int bytes); - void onPopupClick(wxCommandEvent& evt); - void focusEvent(wxFocusEvent& evt) { Refresh(); }; - void pasteHex(); - - DebugInterface* cpu; - int rowHeight; - int charWidth; - u32 windowStart; - u32 curAddress; // current selected address - u32 referencedAddress; // refrenced by register - u32 byteGroupSize; - int rowSize; - wxFont font,underlineFont; - - int addressStart; - int hexStart; - int asciiStart; - bool asciiSelected; - int selectedNibble; - - std::stack history; - wxMenu menu; -}; diff --git a/pcsx2/gui/Debugger/CtrlRegisterList.cpp b/pcsx2/gui/Debugger/CtrlRegisterList.cpp deleted file mode 100644 index 6dbe936497..0000000000 --- a/pcsx2/gui/Debugger/CtrlRegisterList.cpp +++ /dev/null @@ -1,642 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "CtrlRegisterList.h" -#include "DebugTools/Debug.h" -#include "common/BitCast.h" -#include "common/StringUtil.h" - -#include "DebugEvents.h" -#include "gui/AppConfig.h" -#include "DisassemblyDialog.h" - -wxBEGIN_EVENT_TABLE(CtrlRegisterList, wxWindow) - EVT_SIZE(CtrlRegisterList::sizeEvent) - EVT_LEFT_DOWN(CtrlRegisterList::mouseEvent) - EVT_RIGHT_DOWN(CtrlRegisterList::mouseEvent) - EVT_RIGHT_UP(CtrlRegisterList::mouseEvent) - EVT_MOTION(CtrlRegisterList::mouseEvent) - EVT_KEY_DOWN(CtrlRegisterList::keydownEvent) -wxEND_EVENT_TABLE() - -enum DisassemblyMenuIdentifiers { - ID_REGISTERLIST_RESOLVESTRINGS, - ID_REGISTERLIST_DISPLAYVU0FFLOATS, - ID_REGISTERLIST_CHANGELOWER, - ID_REGISTERLIST_CHANGEUPPER, - ID_REGISTERLIST_CHANGEVALUE, - ID_REGISTERLIST_GOTOINMEMORYVIEW, - ID_REGISTERLIST_GOTOINDISASM -}; - - -CtrlRegisterList::CtrlRegisterList(wxWindow* parent, DebugInterface* _cpu) - : wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxBORDER_NONE | wxVSCROLL) - , cpu(_cpu) -{ - rowHeight = getDebugFontHeight() + 2; - charWidth = getDebugFontWidth(); - category = 0; - lastPc = 0xFFFFFFFF; - resolvePointerStrings = false; - displayVU0FAsFloat = false; - - for (int i = 0; i < cpu->getRegisterCategoryCount(); i++) - { - const int count = cpu->getRegisterCount(i); - - ChangedReg* regs = new ChangedReg[count]; - memset(regs, 0, sizeof(ChangedReg) * count); - changedCategories.push_back(regs); - - int maxLen = 0; - for (int k = 0; k < cpu->getRegisterCount(i); k++) - { - maxLen = std::max(maxLen, strlen(cpu->getRegisterName(i, k))); /* Flawfinder: ignore */ - } - - const int x = 17 + (maxLen + 2) * charWidth; - startPositions.push_back(x); - currentRows.push_back(0); - } - - SetDoubleBuffered(true); - - const wxSize optSize = getOptimalSize(); - SetVirtualSize(optSize.x,optSize.y); - SetScrollbars(1, rowHeight, optSize.x, optSize.y * MSW_GetDPIScale() / rowHeight, 0, 0); -} - -CtrlRegisterList::~CtrlRegisterList() -{ - for (auto& regs : changedCategories) - delete[] regs; -} - -wxSize CtrlRegisterList::getOptimalSize() const -{ - wxSize optRegListSize; - if (cpu->getCpuType() == BreakPointCpu::BREAKPOINT_EE) - { - optRegListSize = wxSize(331, 504); - } - else - { - // We are constructing the IOP register view - optRegListSize = wxSize(133, 504); - } - - return wxSize(optRegListSize.x, optRegListSize.y); -} - -void CtrlRegisterList::postEvent(wxEventType type, wxString text) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetString(text); - wxPostEvent(this, event); -} - -void CtrlRegisterList::postEvent(wxEventType type, int value) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetInt(value); - wxPostEvent(this, event); -} - -void CtrlRegisterList::refreshChangedRegs() -{ - if (cpu->getPC() == lastPc) - return; - - for (size_t cat = 0; cat < changedCategories.size(); cat++) - { - ChangedReg* regs = changedCategories[cat]; - const int size = cpu->getRegisterSize(category); - - for (int i = 0; i < cpu->getRegisterCount(cat); i++) - { - ChangedReg& reg = regs[i]; - memset(®.changed, 0, sizeof(reg.changed)); - - const u128 newValue = cpu->getRegister(cat, i); - - if (reg.oldValue != newValue) - { - bool changed = false; - - if (size >= 128 && (reg.oldValue._u32[3] != newValue._u32[3] || reg.oldValue._u32[2] != newValue._u32[2])) - { - changed = true; - reg.changed[3] = true; - reg.changed[2] = true; - } - - if (size >= 64 && (reg.oldValue._u32[1] != newValue._u32[1] || changed)) - { - changed = true; - reg.changed[1] = true; - } - - if (reg.oldValue._u32[0] != newValue._u32[0] || changed) - { - reg.changed[0] = true; - } - - reg.oldValue = newValue; - } - } - } - - lastPc = cpu->getPC(); -} - -void CtrlRegisterList::redraw() -{ - Update(); -} - -void CtrlRegisterList::sizeEvent(wxSizeEvent& evt) -{ - Refresh(); - evt.Skip(); -} - -void drawU32Text(wxDC& dc, u32 value, int x, int y) -{ - char str[32]; - sprintf(str, "%08X", value); - dc.DrawText(wxString(str, wxConvUTF8), x, y); -} - -void CtrlRegisterList::OnDraw(wxDC& dc) -{ - wxFont font = pxGetFixedFont(8); - font.SetPixelSize(wxSize(charWidth, rowHeight - 2)); - dc.SetFont(font); - - refreshChangedRegs(); - - wxColor colorChanged = wxColor(0xFF0000FF); - wxColor colorUnchanged = wxColor(0xFF004000); - wxColor colorNormal = wxColor(0xFF600000); - - int startRow; - GetViewStart(nullptr, &startRow); - int endRow = startRow + ceil(float(GetClientSize().y) / rowHeight); - - // draw categories - const int width = GetClientSize().x; - if (startRow == 0) - { - int piece = width / cpu->getRegisterCategoryCount(); - for (int i = 0; i < cpu->getRegisterCategoryCount(); i++) - { - const char* name = cpu->getRegisterCategoryName(i); - - int x = i * piece; - - if (i == category) - { - dc.SetBrush(wxBrush(wxColor(0xFF70FF70))); - dc.SetPen(wxPen(wxColor(0xFF000000))); - } - else - { - dc.SetBrush(wxBrush(wxColor(0xFFFFEFE8))); - dc.SetPen(wxPen(wxColor(0xFF000000))); - } - - if (i == cpu->getRegisterCategoryCount() - 1) - piece += width - piece * cpu->getRegisterCategoryCount() - 1; - - dc.DrawRectangle(x, 0, piece + 1, rowHeight); - - // center text - x += (piece - strlen(name) * charWidth) / 2; /* Flawfinder: ignore */ - dc.DrawText(wxString(name, wxConvUTF8), x, 2); - } - } - - // skip the tab row - startRow = std::max(0, startRow - 1); - endRow = std::min(cpu->getRegisterCount(category) - 1, endRow - 1); - - const wxString vu0fTitles[5] = {"W", "Z", "Y", "X"}; - int vu0fTitleCur = 0; - const int nameStart = 17; - const int valueStart = startPositions[category]; - - ChangedReg* changedRegs = changedCategories[category]; - const int registerBits = cpu->getRegisterSize(category); - DebugInterface::RegisterType type = cpu->getRegisterType(category); - - for (int i = startRow; i <= endRow; i++) - { - int x = valueStart; - // Skip a row if we are showing our VU0f registers - // This makes room for the WZYX title - const int y = rowHeight * (i + (category == EECAT_VU0F ? 2 : 1)); - - wxColor backgroundColor; - if (currentRows[category] == i) - backgroundColor = wxColor(0xFFFFCFC8); - else if (i % 2) - backgroundColor = wxColor(237, 242, 255, 255); - else - backgroundColor = wxColor(0xFFFFFFFF); - - dc.SetBrush(backgroundColor); - dc.SetPen(backgroundColor); - dc.DrawRectangle(0, y, width, rowHeight); - - const char* name = cpu->getRegisterName(category, i); - dc.SetTextForeground(colorNormal); - dc.DrawText(wxString(name, wxConvUTF8), nameStart, y + 2); - - const u128 value = cpu->getRegister(category, i); - const ChangedReg& changed = changedRegs[i]; - - switch (type) - { - case DebugInterface::SPECIAL: // let debug interface format them and just display them - { - if (changed.changed[0] || changed.changed[1] || changed.changed[2] || changed.changed[3]) - dc.SetTextForeground(colorChanged); - else - dc.SetTextForeground(colorUnchanged); - - if (category == EECAT_VU0F) - { - if (displayVU0FAsFloat) - { - char str[256]; - const u128 val = cpu->getRegister(category, i); - // Print each register part individually so we know exactly where each part starts - // and use this information for printing the VU0F titles - for (int j = 3; j >= 0; j--) - { - sprintf(str, "%7.2f", bit_cast(val._u32[j])); - dc.DrawText(wxString(str), x, y + 2); - x += charWidth * 8 + 2; - } - - // Only draw the VU0f titles when we are drawing the first row - if (i == startRow) - { - x = valueStart; // Reset our X back to the starting position - - for (int j = 0; j < 4; j++) - { - dc.SetTextForeground(colorNormal); - dc.DrawText(vu0fTitles[j], (x + charWidth * 4) - 4, rowHeight + 2); - x += charWidth * 8 + 2; - } - } - - break; - } - } - else - { - dc.DrawText(StringUtil::UTF8StringToWxString(cpu->getRegisterString(category, i)), x, y + 2); - break; - } - } - [[fallthrough]]; - case DebugInterface::NORMAL: // display them in 32 bit parts - { - switch (registerBits) - { - case 128: - { - int startIndex = 3; - - if (resolvePointerStrings && cpu->isAlive()) - { - const char* strval = cpu->stringFromPointer(value._u32[0]); - if (strval) - { - static wxColor clr = wxColor(0xFF228822); - dc.SetTextForeground(clr); - dc.DrawText(wxString(strval), width - (32 * charWidth + 12), y + 2); - startIndex = 0; - } - } - - const int actualX = width - 4 - (startIndex + 1) * (8 * charWidth + 2); - x = std::max(actualX, x); - - if (startIndex != 3) - { - bool c = false; - for (int i = 3; i > startIndex; i--) - c = c || changed.changed[i]; - - if (c) - { - dc.SetTextForeground(colorChanged); - dc.DrawText(L"+", x - charWidth, y + 2); - } - } - - for (int j = startIndex; j >= 0; j--) - { - if (changed.changed[j]) - dc.SetTextForeground(colorChanged); - else - dc.SetTextForeground(colorUnchanged); - - drawU32Text(dc, value._u32[j], x, y + 2); - - // Only draw the VU0f titles when we are drawing the first row and are on the VU0f category - if (category == EECAT_VU0F && i == startRow) - { - dc.SetTextForeground(colorNormal); - dc.DrawText(vu0fTitles[vu0fTitleCur++], x + (charWidth * 2.5), rowHeight + 2); - } - x += charWidth * 8 + 2; - } - - break; - } - case 64: - { - for (int j = 1; j >= 0; j--) - { - if (changed.changed[j]) - dc.SetTextForeground(colorChanged); - else - dc.SetTextForeground(colorUnchanged); - - drawU32Text(dc, value._u32[j], x, y + 2); - x += charWidth * 8 + 2; - } - - break; - } - case 32: - { - if (changed.changed[0]) - dc.SetTextForeground(colorChanged); - else - dc.SetTextForeground(colorUnchanged); - - drawU32Text(dc, value._u32[0], x, y + 2); - break; - } - } - break; - } - } - } -} - -void CtrlRegisterList::changeValue(RegisterChangeMode mode) -{ - wchar_t str[64]; - - u128 oldValue = cpu->getRegister(category, currentRows[category]); - - switch (mode) - { - case LOWER64: - swprintf(str, 64, L"0x%016llX", oldValue._u64[0]); - break; - case UPPER64: - swprintf(str, 64, L"0x%016llX", oldValue._u64[1]); - break; - case CHANGE32: - swprintf(str, 64, L"0x%08X", oldValue._u32[0]); - break; - } - - u64 newValue; - if (executeExpressionWindow(this, cpu, newValue, str)) - { - switch (mode) - { - case LOWER64: - oldValue._u64[0] = newValue; - break; - case UPPER64: - oldValue._u64[1] = newValue; - break; - case CHANGE32: - oldValue._u32[0] = newValue; - break; - } - - cpu->setRegister(category, currentRows[category], oldValue); - } -} - - -void CtrlRegisterList::onPopupClick(wxCommandEvent& evt) -{ - switch (evt.GetId()) - { - case ID_REGISTERLIST_RESOLVESTRINGS: - resolvePointerStrings = !resolvePointerStrings; - postEvent(debEVT_UPDATELAYOUT, 0); - Refresh(); - break; - case ID_REGISTERLIST_DISPLAYVU0FFLOATS: - displayVU0FAsFloat = !displayVU0FAsFloat; - postEvent(debEVT_UPDATELAYOUT, 0); - Refresh(); - break; - case ID_REGISTERLIST_CHANGELOWER: - changeValue(LOWER64); - Refresh(); - break; - case ID_REGISTERLIST_CHANGEUPPER: - changeValue(UPPER64); - Refresh(); - break; - case ID_REGISTERLIST_CHANGEVALUE: - if (cpu->getRegisterSize(category) == 32) - changeValue(CHANGE32); - else - changeValue(LOWER64); - Refresh(); - break; - case ID_REGISTERLIST_GOTOINMEMORYVIEW: - postEvent(debEVT_GOTOINMEMORYVIEW, cpu->getRegister(category, currentRows[category])._u32[0]); - break; - case ID_REGISTERLIST_GOTOINDISASM: - postEvent(debEVT_GOTOINDISASM, cpu->getRegister(category, currentRows[category])._u32[0]); - break; - default: - wxMessageBox(L"Unimplemented.", L"Unimplemented.", wxICON_INFORMATION); - break; - } -} - -void CtrlRegisterList::setCurrentRow(int row) -{ - char str[256]; - u128 value; - std::string text; - - const char* name = cpu->getRegisterName(category, row); - - switch (cpu->getRegisterType(category)) - { - case DebugInterface::NORMAL: - value = cpu->getRegister(category, row); - postEvent(debEVT_REFERENCEMEMORYVIEW, value._u32[0]); - - switch (cpu->getRegisterSize(category)) - { - case 128: - sprintf(str, "%s = 0x%08X%08X%08X%08X", name, value._u32[3], value._u32[2], value._u32[1], value._u32[0]); - break; - case 64: - sprintf(str, "%s = 0x%08X%08X", name, value._u32[1], value._u32[0]); - break; - case 32: - sprintf(str, "%s = 0x%08X", name, value._u32[0]); - break; - } - text = str; - break; - case DebugInterface::SPECIAL: - text = std::string(name) + " = " + cpu->getRegisterString(category, row); - break; - } - - currentRows[category] = row; - postEvent(debEVT_SETSTATUSBARTEXT, StringUtil::UTF8StringToWxString(text)); - ensureVisible(currentRows[category] + 1); //offset due to header at scroll position 0 - Refresh(); -} - -void CtrlRegisterList::mouseEvent(wxMouseEvent& evt) -{ - int xOffset, yOffset; - ((wxScrolledWindow*)this)->GetViewStart(&xOffset, &yOffset); - - wxClientDC dc(this); - wxPoint pos = evt.GetPosition(); - const int x = dc.DeviceToLogicalX(pos.x) + xOffset; - const int y = dc.DeviceToLogicalY(pos.y) + yOffset * rowHeight; - - if (evt.GetEventType() == wxEVT_RIGHT_UP) - { - if (y >= rowHeight) - { - // The ternary here is due to the fact that VU0f has an extra row for the w z y x title - const int row = (y - rowHeight * (category == EECAT_VU0F ? 2 : 1)) / rowHeight; - if (row != currentRows[category] && row < cpu->getRegisterCount(category)) - setCurrentRow(row); - } - - wxMenu menu; - - - if (category == EECAT_VU0F) - { - menu.AppendCheckItem(ID_REGISTERLIST_DISPLAYVU0FFLOATS, L"Display VU0f registers as floats")->Check(displayVU0FAsFloat); - } - else - { - menu.AppendCheckItem(ID_REGISTERLIST_RESOLVESTRINGS, L"Resolve string pointers")->Check(resolvePointerStrings); - } - - menu.AppendSeparator(); - - const int bits = cpu->getRegisterSize(category); - if (bits >= 64) - { - menu.Append(ID_REGISTERLIST_CHANGELOWER, L"Change lower 64 bit"); - menu.Append(ID_REGISTERLIST_CHANGEUPPER, L"Change upper 64 bit"); - } - else - { - menu.Append(ID_REGISTERLIST_CHANGEVALUE, L"Change value"); - } - - menu.AppendSeparator(); - menu.Append(ID_REGISTERLIST_GOTOINMEMORYVIEW, L"Follow in Memory view"); - menu.Append(ID_REGISTERLIST_GOTOINDISASM, L"Follow in Disasm"); - - menu.Bind(wxEVT_MENU, &CtrlRegisterList::onPopupClick, this); - PopupMenu(&menu, evt.GetPosition()); - return; - } - - if (evt.ButtonIsDown(wxMOUSE_BTN_LEFT) || evt.ButtonIsDown(wxMOUSE_BTN_RIGHT)) - { - if (y < rowHeight) - { - const int piece = GetSize().x / cpu->getRegisterCategoryCount(); - const int cat = std::min(x / piece, cpu->getRegisterCategoryCount() - 1); - - if (cat != category) - { - category = cat; - Refresh(); - } - } - else - { - // The ternary here is due to the fact that VU0f has an extra row for the w z y x title - const int row = (y - rowHeight * (category == EECAT_VU0F ? 2 : 1)) / rowHeight; - if (row != currentRows[category] && row < cpu->getRegisterCount(category)) - setCurrentRow(row); - } - - SetFocus(); - SetFocusFromKbd(); - } -} - -void CtrlRegisterList::ensureVisible(int index) -{ - //scroll vertically to keep a logical position visible - int x, y; - GetViewStart(&x, &y); - const int visibleOffset = floor(float(GetClientSize().y) / rowHeight) - 1; - if (index < y) - Scroll(x, index); - else if (index > y + visibleOffset) - Scroll(x, index - visibleOffset); -} - -void CtrlRegisterList::keydownEvent(wxKeyEvent& evt) -{ - switch (evt.GetKeyCode()) - { - case WXK_UP: - int x, y; - GetViewStart(&x, &y); - //If at top of rows allow scrolling an extra time to show tab header - if (currentRows[category] == 0 && y == 1) - Scroll(x, 0); - else - setCurrentRow(std::max(currentRows[category] - 1, 0)); - break; - case WXK_DOWN: - setCurrentRow(std::min(currentRows[category] + 1, cpu->getRegisterCount(category) - 1)); - break; - case WXK_TAB: - category = (category + 1) % cpu->getRegisterCategoryCount(); - Refresh(); - break; - } -} diff --git a/pcsx2/gui/Debugger/CtrlRegisterList.h b/pcsx2/gui/Debugger/CtrlRegisterList.h deleted file mode 100644 index 676176f172..0000000000 --- a/pcsx2/gui/Debugger/CtrlRegisterList.h +++ /dev/null @@ -1,84 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include - -#include "gui/MSWstuff.h" // Required for MSW_GetDPIScale() -#include "DebugTools/DebugInterface.h" -#include "DebugTools/DisassemblyManager.h" - -class CtrlRegisterList : public wxScrolledWindow -{ -public: - CtrlRegisterList(wxWindow* parent, DebugInterface* _cpu); - ~CtrlRegisterList(); - - void mouseEvent(wxMouseEvent& evt); - void keydownEvent(wxKeyEvent& evt); - void onPopupClick(wxCommandEvent& evt); - void sizeEvent(wxSizeEvent& evt); - void redraw(); - wxDECLARE_EVENT_TABLE(); - - virtual wxSize GetMinClientSize() const - { - wxSize optimalSize = getOptimalSize(); - if (GetWindowStyle() & wxVSCROLL) - optimalSize.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - - return wxSize(optimalSize.x * MSW_GetDPIScale(), 0); - } - - virtual wxSize DoGetBestClientSize() const - { - return GetMinClientSize(); - } - -private: - enum RegisterChangeMode - { - LOWER64, - UPPER64, - CHANGE32 - }; - - void OnDraw(wxDC& dc); - void refreshChangedRegs(); - void setCurrentRow(int row); - void ensureVisible(int index); - void changeValue(RegisterChangeMode mode); - wxSize getOptimalSize() const; - - void postEvent(wxEventType type, wxString text); - void postEvent(wxEventType type, int value); - - struct ChangedReg - { - u128 oldValue; - bool changed[4]; - }; - - std::vector changedCategories; - std::vector startPositions; - std::vector currentRows; - - DebugInterface* cpu; - int rowHeight, charWidth; - u32 lastPc; - int category; - bool resolvePointerStrings; - bool displayVU0FAsFloat; -}; diff --git a/pcsx2/gui/Debugger/DebugEvents.cpp b/pcsx2/gui/Debugger/DebugEvents.cpp deleted file mode 100644 index 6c3a5db9d3..0000000000 --- a/pcsx2/gui/Debugger/DebugEvents.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "DebugEvents.h" - -wxDEFINE_EVENT(debEVT_SETSTATUSBARTEXT, wxCommandEvent); -wxDEFINE_EVENT(debEVT_UPDATELAYOUT, wxCommandEvent); -wxDEFINE_EVENT(debEVT_GOTOADDRESS, wxCommandEvent); -wxDEFINE_EVENT(debEVT_GOTOINMEMORYVIEW, wxCommandEvent); -wxDEFINE_EVENT(debEVT_REFERENCEMEMORYVIEW, wxCommandEvent); -wxDEFINE_EVENT(debEVT_GOTOINDISASM, wxCommandEvent); -wxDEFINE_EVENT(debEVT_RUNTOPOS, wxCommandEvent); -wxDEFINE_EVENT(debEVT_MAPLOADED, wxCommandEvent); -wxDEFINE_EVENT(debEVT_STEPOVER, wxCommandEvent); -wxDEFINE_EVENT(debEVT_STEPINTO, wxCommandEvent); -wxDEFINE_EVENT(debEVT_STEPOUT, wxCommandEvent); -wxDEFINE_EVENT(debEVT_UPDATE, wxCommandEvent); -wxDEFINE_EVENT(debEVT_BREAKPOINTWINDOW, wxCommandEvent); - -bool parseExpression(const char* exp, DebugInterface* cpu, u64& dest) -{ - PostfixExpression postfix; - if (!cpu->initExpression(exp,postfix)) return false; - return cpu->parseExpression(postfix,dest); -} - -void displayExpressionError(wxWindow* parent) -{ - wxMessageBox(wxString(getExpressionError(),wxConvUTF8),L"Invalid expression",wxICON_ERROR); -} - -bool executeExpressionWindow(wxWindow* parent, DebugInterface* cpu, u64& dest, const wxString& defaultValue) -{ - wxString result = wxGetTextFromUser(L"Enter expression",L"Expression",defaultValue,parent); - if (result.empty()) - return false; - - wxCharBuffer expression = result.ToUTF8(); - if (!parseExpression(expression, cpu, dest)) - { - displayExpressionError(parent); - return false; - } - - return true; -} diff --git a/pcsx2/gui/Debugger/DebugEvents.h b/pcsx2/gui/Debugger/DebugEvents.h deleted file mode 100644 index e8032ad11f..0000000000 --- a/pcsx2/gui/Debugger/DebugEvents.h +++ /dev/null @@ -1,34 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include -#include "DebugTools/DebugInterface.h" - -wxDECLARE_EVENT(debEVT_SETSTATUSBARTEXT, wxCommandEvent); -wxDECLARE_EVENT(debEVT_UPDATELAYOUT, wxCommandEvent); -wxDECLARE_EVENT(debEVT_GOTOADDRESS, wxCommandEvent); -wxDECLARE_EVENT(debEVT_GOTOINMEMORYVIEW, wxCommandEvent); -wxDECLARE_EVENT(debEVT_REFERENCEMEMORYVIEW, wxCommandEvent); -wxDECLARE_EVENT(debEVT_GOTOINDISASM, wxCommandEvent); -wxDECLARE_EVENT(debEVT_RUNTOPOS, wxCommandEvent); -wxDECLARE_EVENT(debEVT_MAPLOADED, wxCommandEvent); -wxDECLARE_EVENT(debEVT_STEPOVER, wxCommandEvent); -wxDECLARE_EVENT(debEVT_STEPINTO, wxCommandEvent); -wxDECLARE_EVENT(debEVT_STEPOUT, wxCommandEvent); -wxDECLARE_EVENT(debEVT_UPDATE, wxCommandEvent); -wxDECLARE_EVENT(debEVT_BREAKPOINTWINDOW, wxCommandEvent); - -bool executeExpressionWindow(wxWindow* parent, DebugInterface* cpu, u64& dest, const wxString& defaultValue = wxEmptyString); diff --git a/pcsx2/gui/Debugger/DebuggerLists.cpp b/pcsx2/gui/Debugger/DebuggerLists.cpp deleted file mode 100644 index b28e611486..0000000000 --- a/pcsx2/gui/Debugger/DebuggerLists.cpp +++ /dev/null @@ -1,821 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "DebuggerLists.h" -#include "BreakpointWindow.h" -#include "DebugEvents.h" -#include "pcsx2/gui/StringHelpers.h" - -wxBEGIN_EVENT_TABLE(GenericListView, wxWindow) - EVT_SIZE(GenericListView::sizeEvent) - EVT_KEY_DOWN(GenericListView::keydownEvent) - EVT_RIGHT_DOWN(GenericListView::mouseEvent) - EVT_RIGHT_UP(GenericListView::mouseEvent) - EVT_LEFT_DCLICK(GenericListView::mouseEvent) - EVT_LIST_ITEM_RIGHT_CLICK(wxID_ANY, GenericListView::listEvent) -wxEND_EVENT_TABLE() - -GenericListView::GenericListView(wxWindow* parent, GenericListViewColumn* columns, int columnCount) - : wxListView(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_VIRTUAL | wxLC_REPORT | wxLC_SINGLE_SEL | wxNO_BORDER) -{ - m_isInResizeColumn = false; - dontResizeColumnsInSizeEventHandler = false; - - insertColumns(columns, columnCount); -} - -void GenericListView::insertColumns(GenericListViewColumn* columns, int count) -{ - int totalWidth = GetSize().x; - - for (int i = 0; i < count; i++) - { - wxListItem column; - column.SetText(columns[i].name); - column.SetWidth(totalWidth * columns[i].size); - - InsertColumn(i, column); - } - - this->columns = columns; -} - -void GenericListView::resizeColumn(int col, int width) -{ - if (!m_isInResizeColumn) - { - m_isInResizeColumn = true; - - SetColumnWidth(col, width); - - m_isInResizeColumn = false; - } -} - -void GenericListView::resizeColumns(int totalWidth) -{ - for (int i = 0; i < GetColumnCount(); i++) - { - resizeColumn(i, totalWidth * columns[i].size); - } -} - -void GenericListView::sizeEvent(wxSizeEvent& evt) -{ - // HACK: On Windows, it seems that if you resize the columns in the size - // event handler when the scrollbar disappears, the listview contents may - // decide to disappear as well. So let's avoid the resize for this case. - if (!dontResizeColumnsInSizeEventHandler) - resizeColumns(GetClientSize().x); - dontResizeColumnsInSizeEventHandler = false; - evt.Skip(); -} - -void GenericListView::keydownEvent(wxKeyEvent& evt) -{ - int sel = GetFirstSelected(); - switch (evt.GetKeyCode()) - { - case WXK_UP: - if (sel > 0) - { - Select(sel - 1); - Focus(sel - 1); - } - break; - case WXK_DOWN: - if (sel + 1 < GetItemCount()) - { - Select(sel + 1); - Focus(sel + 1); - } - break; - } - - onKeyDown(evt.GetKeyCode()); -} - -void GenericListView::update() -{ - int newRows = getRowCount(); - int oldRows = GetItemCount(); - - SetItemCount(newRows); - - if (newRows != oldRows) - { - resizeColumns(GetClientSize().x); - - // wx adds the horizontal scrollbar based on the old column width, - // which changes the client width. Simply resizing the columns won't - // make the scrollbar go away, so let's make it recalculate if it needs it - SetItemCount(newRows); - } - dontResizeColumnsInSizeEventHandler = true; - Refresh(); -} - -wxString GenericListView::OnGetItemText(long item, long col) const -{ - return getColumnText(item, col); -} - -void GenericListView::postEvent(wxEventType type, int value) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetInt(value); - wxPostEvent(this, event); -} - -void GenericListView::mouseEvent(wxMouseEvent& evt) -{ - wxEventType type = evt.GetEventType(); - - if (type == wxEVT_RIGHT_DOWN) - { - clickPos = evt.GetPosition(); - evt.Skip(); - } - else if (type == wxEVT_RIGHT_UP) - { - onRightClick(GetFirstSelected(), evt.GetPosition()); - } - else if (type == wxEVT_LEFT_DCLICK) - { - onDoubleClick(GetFirstSelected(), evt.GetPosition()); - } -} - -void GenericListView::listEvent(wxListEvent& evt) -{ - onRightClick(GetFirstSelected(), clickPos); -} - -// -// BreakpointList -// - -enum -{ - BPL_TYPE, - BPL_OFFSET, - BPL_SIZELABEL, - BPL_OPCODE, - BPL_CONDITION, - BPL_HITS, - BPL_ENABLED, - BPL_COLUMNCOUNT -}; - -enum BreakpointListMenuIdentifiers -{ - ID_BREAKPOINTLIST_ENABLE = 1, - ID_BREAKPOINTLIST_EDIT, - ID_BREAKPOINTLIST_DELETE, - ID_BREAKPOINTLIST_ADDNEW, -}; - -GenericListViewColumn breakpointColumns[BPL_COLUMNCOUNT] = { - {L"Type", 0.12f}, - {L"Offset", 0.12f}, - {L"Size/Label", 0.18f}, - {L"Opcode", 0.28f}, - {L"Condition", 0.17f}, - {L"Hits", 0.05f}, - {L"Enabled", 0.08f}}; - -BreakpointList::BreakpointList(wxWindow* parent, DebugInterface* _cpu, CtrlDisassemblyView* _disassembly) - : GenericListView(parent, breakpointColumns, BPL_COLUMNCOUNT) - , cpu(_cpu) - , disasm(_disassembly) -{ -} - -int BreakpointList::getRowCount() -{ - int count = 0; - for (size_t i = 0; i < CBreakPoints::GetMemChecks().size(); i++) - { - if (displayedMemChecks_[i].cpu == cpu->getCpuType()) - count++; - } - for (size_t i = 0; i < CBreakPoints::GetBreakpoints().size(); i++) - { - if (!displayedBreakPoints_[i].temporary && displayedBreakPoints_[i].cpu == cpu->getCpuType()) - count++; - } - - return count; -} - -wxString BreakpointList::getColumnText(int item, int col) const -{ - FastFormatUnicode dest; - bool isMemory; - int index = getBreakpointIndex(item, isMemory); - if (index == -1) - return L"Invalid"; - - switch (col) - { - case BPL_TYPE: - { - if (isMemory) - { - switch ((int)displayedMemChecks_[index].cond) - { - case MEMCHECK_READ: - dest.Write("Read"); - break; - case MEMCHECK_WRITE: - dest.Write("Write"); - break; - case MEMCHECK_READWRITE: - dest.Write("Read/Write"); - break; - case MEMCHECK_WRITE | MEMCHECK_WRITE_ONCHANGE: - dest.Write("Write Change"); - break; - case MEMCHECK_READWRITE | MEMCHECK_WRITE_ONCHANGE: - dest.Write("Read/Write Change"); - break; - } - } - else - { - dest.Write(L"Execute"); - } - } - break; - case BPL_OFFSET: - { - if (isMemory) - { - dest.Write("0x%08X", displayedMemChecks_[index].start); - } - else - { - dest.Write("0x%08X", displayedBreakPoints_[index].addr); - } - } - break; - case BPL_SIZELABEL: - { - if (isMemory) - { - auto mc = displayedMemChecks_[index]; - if (mc.end == 0) - dest.Write("0x%08X", 1); - else - dest.Write("0x%08X", mc.end - mc.start); - } - else - { - const std::string sym = cpu->GetSymbolMap().GetLabelString(displayedBreakPoints_[index].addr); - if (!sym.empty()) - { - dest.Write("%s", sym.c_str()); - } - else - { - dest.Write("-"); - } - } - } - break; - case BPL_OPCODE: - { - if (isMemory) - { - dest.Write(L"-"); - } - else - { - if (!cpu->isAlive()) - break; - char temp[256]; - disasm->getOpcodeText(displayedBreakPoints_[index].addr, temp); - dest.Write("%s", temp); - } - } - break; - case BPL_CONDITION: - { - if (isMemory || !displayedBreakPoints_[index].hasCond) - { - dest.Write("-"); - } - else - { - dest.Write("%s", displayedBreakPoints_[index].cond.expressionString); - } - } - break; - case BPL_HITS: - { - if (isMemory) - { - dest.Write("%d", displayedMemChecks_[index].numHits); - } - else - { - dest.Write("-"); - } - } - break; - case BPL_ENABLED: - { - if (isMemory) - { - dest.Write("%s", displayedMemChecks_[index].result & MEMCHECK_BREAK ? "true" : "false"); - } - else - { - dest.Write("%s", displayedBreakPoints_[index].enabled ? "true" : "false"); - } - } - break; - default: - return L"Invalid"; - } - - return dest; -} - -void BreakpointList::onKeyDown(int key) -{ - int sel = GetFirstSelected(); - switch (key) - { - case WXK_DELETE: - removeBreakpoint(sel); - break; - case WXK_RETURN: - editBreakpoint(sel); - break; - case WXK_SPACE: - toggleEnabled(sel); - break; - } -} - -int BreakpointList::getBreakpointIndex(int itemIndex, bool& isMemory) const -{ - // memory breakpoints first - for (size_t i = 0; i < displayedMemChecks_.size(); i++) - { - if (displayedMemChecks_[i].cpu != cpu->getCpuType()) - continue; - if (itemIndex == 0) - { - isMemory = true; - return (int)i; - } - itemIndex--; - } - - size_t i = 0; - while (i < displayedBreakPoints_.size()) - { - if (displayedBreakPoints_[i].temporary || displayedBreakPoints_[i].cpu != cpu->getCpuType()) - { - i++; - continue; - } - - // the index is 0 when there are no more breakpoints to skip - if (itemIndex == 0) - { - isMemory = false; - return (int)i; - } - - i++; - itemIndex--; - } - - return -1; -} - -void BreakpointList::reloadBreakpoints() -{ - // Update the items we're displaying from the debugger. - displayedBreakPoints_ = CBreakPoints::GetBreakpoints(); - displayedMemChecks_ = CBreakPoints::GetMemChecks(); - update(); -} - -void BreakpointList::editBreakpoint(int itemIndex) -{ - bool isMemory; - int index = getBreakpointIndex(itemIndex, isMemory); - if (index == -1) - return; - - BreakpointWindow win(this, cpu); - if (isMemory) - { - auto mem = displayedMemChecks_[index]; - win.loadFromMemcheck(mem); - if (win.ShowModal() == wxID_OK) - { - CBreakPoints::RemoveMemCheck(cpu->getCpuType(), mem.start, mem.end); - win.addBreakpoint(); - } - } - else - { - auto bp = displayedBreakPoints_[index]; - win.loadFromBreakpoint(bp); - if (win.ShowModal() == wxID_OK) - { - CBreakPoints::RemoveBreakPoint(cpu->getCpuType(), bp.addr); - win.addBreakpoint(); - } - } -} - -void BreakpointList::toggleEnabled(int itemIndex) -{ - bool isMemory; - int index = getBreakpointIndex(itemIndex, isMemory); - if (index == -1) - return; - - if (isMemory) - { - MemCheck mcPrev = displayedMemChecks_[index]; - CBreakPoints::ChangeMemCheck(cpu->getCpuType(), mcPrev.start, mcPrev.end, mcPrev.cond, MemCheckResult(mcPrev.result ^ MEMCHECK_BREAK)); - } - else - { - BreakPoint bpPrev = displayedBreakPoints_[index]; - CBreakPoints::ChangeBreakPoint(cpu->getCpuType(), bpPrev.addr, !bpPrev.enabled); - } -} - -void BreakpointList::gotoBreakpointAddress(int itemIndex) -{ - bool isMemory; - int index = getBreakpointIndex(itemIndex, isMemory); - if (index == -1) - return; - - if (isMemory) - { - u32 address = displayedMemChecks_[index].start; - postEvent(debEVT_GOTOINMEMORYVIEW, address); - } - else - { - u32 address = displayedBreakPoints_[index].addr; - postEvent(debEVT_GOTOINDISASM, address); - } -} - -void BreakpointList::removeBreakpoint(int itemIndex) -{ - bool isMemory; - int index = getBreakpointIndex(itemIndex, isMemory); - if (index == -1) - return; - - if (isMemory) - { - auto mc = displayedMemChecks_[index]; - CBreakPoints::RemoveMemCheck(cpu->getCpuType(), mc.start, mc.end); - } - else - { - u32 address = displayedBreakPoints_[index].addr; - CBreakPoints::RemoveBreakPoint(displayedBreakPoints_[index].cpu, address); - } -} - -void BreakpointList::onPopupClick(wxCommandEvent& evt) -{ - int index = GetFirstSelected(); - switch (evt.GetId()) - { - case ID_BREAKPOINTLIST_ENABLE: - toggleEnabled(index); - break; - case ID_BREAKPOINTLIST_EDIT: - editBreakpoint(index); - break; - case ID_BREAKPOINTLIST_DELETE: - removeBreakpoint(index); - break; - case ID_BREAKPOINTLIST_ADDNEW: - postEvent(debEVT_BREAKPOINTWINDOW, 0); - break; - default: - wxMessageBox(L"Unimplemented.", L"Unimplemented.", wxICON_INFORMATION); - break; - } -} - -void BreakpointList::showMenu(const wxPoint& pos) -{ - bool isMemory; - int index = getBreakpointIndex(GetFirstSelected(), isMemory); - - wxMenu menu; - if (index != -1) - { - menu.AppendCheckItem(ID_BREAKPOINTLIST_ENABLE, L"Enable"); - menu.Append(ID_BREAKPOINTLIST_EDIT, L"Edit"); - menu.Append(ID_BREAKPOINTLIST_DELETE, L"Delete"); - menu.AppendSeparator(); - - // check if the breakpoint is enabled - bool enabled; - if (isMemory) - enabled = (displayedMemChecks_[index].result & MEMCHECK_BREAK) != 0; - else - enabled = displayedBreakPoints_[index].enabled; - - menu.Check(ID_BREAKPOINTLIST_ENABLE, enabled); - } - - menu.Append(ID_BREAKPOINTLIST_ADDNEW, L"Add new"); - - menu.Bind(wxEVT_MENU, &BreakpointList::onPopupClick, this); - PopupMenu(&menu, pos); -} - -void BreakpointList::onRightClick(int itemIndex, const wxPoint& point) -{ - showMenu(point); -} - -void BreakpointList::onDoubleClick(int itemIndex, const wxPoint& point) -{ - gotoBreakpointAddress(itemIndex); -} - - -// -// ThreadList -// - -enum -{ - TL_TID, - TL_PROGRAMCOUNTER, - TL_ENTRYPOINT, - TL_PRIORITY, - TL_STATE, - TL_WAITTYPE, - TL_COLUMNCOUNT -}; - -GenericListViewColumn threadColumns[TL_COLUMNCOUNT] = { - {L"TID", 0.08f}, - {L"PC", 0.21f}, - {L"Entry Point", 0.21f}, - {L"Priority", 0.08f}, - {L"State", 0.21f}, - {L"Wait type", 0.21f}, -}; - -ThreadList::ThreadList(wxWindow* parent, DebugInterface* _cpu) - : GenericListView(parent, threadColumns, TL_COLUMNCOUNT) - , cpu(_cpu) -{ -} - -void ThreadList::reloadThreads() -{ - threads = getEEThreads(); - update(); -} - - -int ThreadList::getRowCount() -{ - return threads.size(); -} - -wxString ThreadList::getColumnText(int item, int col) const -{ - if (item < 0 || item >= (int)threads.size()) - return L""; - - FastFormatUnicode dest; - const EEThread& thread = threads[item]; - - switch (col) - { - case TL_TID: - dest.Write("%d", thread.tid); - break; - case TL_PROGRAMCOUNTER: - if (thread.data.status == THS_RUN) - dest.Write("0x%08X", cpu->getPC()); - else - dest.Write("0x%08X", thread.data.entry); - break; - case TL_ENTRYPOINT: - dest.Write("0x%08X", thread.data.entry_init); - break; - case TL_PRIORITY: - dest.Write("0x%02X", thread.data.currentPriority); - break; - case TL_STATE: - switch (thread.data.status) - { - case THS_BAD: - dest.Write("Bad"); - break; - case THS_RUN: - dest.Write("Running"); - break; - case THS_READY: - dest.Write("Ready"); - break; - case THS_WAIT: - dest.Write("Waiting"); - break; - case THS_SUSPEND: - dest.Write("Suspended"); - break; - case THS_WAIT_SUSPEND: - dest.Write("Waiting/Suspended"); - break; - case THS_DORMANT: - dest.Write("Dormant"); - break; - } - break; - case TL_WAITTYPE: - switch (thread.data.waitType) - { - case WAIT_NONE: - dest.Write("None"); - break; - case WAIT_WAKEUP_REQ: - dest.Write("Wakeup request"); - break; - case WAIT_SEMA: - dest.Write("Semaphore"); - break; - } - break; - default: - return L"Invalid"; - } - - return dest; -} - -void ThreadList::onDoubleClick(int itemIndex, const wxPoint& point) -{ - if (itemIndex < 0 || itemIndex >= (int)threads.size()) - return; - - const EEThread& thread = threads[itemIndex]; - - switch (thread.data.status) - { - case THS_DORMANT: - case THS_BAD: - postEvent(debEVT_GOTOINDISASM, thread.data.entry_init); - break; - case THS_RUN: - postEvent(debEVT_GOTOINDISASM, cpu->getPC()); - break; - default: - postEvent(debEVT_GOTOINDISASM, thread.data.entry); - break; - } -} - -EEThread ThreadList::getRunningThread() -{ - for (size_t i = 0; i < threads.size(); i++) - { - if (threads[i].data.status == THS_RUN) - return threads[i]; - } - - EEThread thread; - memset(&thread, 0, sizeof(thread)); - thread.tid = -1; - return thread; -} - -// -// StackFramesList -// - -enum -{ - SF_ENTRY, - SF_ENTRYNAME, - SF_CURPC, - SF_CUROPCODE, - SF_CURSP, - SF_FRAMESIZE, - SF_COLUMNCOUNT -}; - -GenericListViewColumn stackFrameolumns[SF_COLUMNCOUNT] = { - {L"Entry", 0.12f}, - {L"Name", 0.24f}, - {L"PC", 0.12f}, - {L"Opcode", 0.28f}, - {L"SP", 0.12f}, - {L"Frame Size", 0.12f}}; - -StackFramesList::StackFramesList(wxWindow* parent, DebugInterface* _cpu, CtrlDisassemblyView* _disassembly) - : GenericListView(parent, stackFrameolumns, SF_COLUMNCOUNT) - , cpu(_cpu) - , disassembly(_disassembly) -{ -} - -void StackFramesList::loadStackFrames(EEThread& currentThread) -{ - frames = MipsStackWalk::Walk(cpu, cpu->getPC(), cpu->getRegister(0, 31), cpu->getRegister(0, 29), - currentThread.data.entry_init, currentThread.data.stack); - update(); -} - -int StackFramesList::getRowCount() -{ - return frames.size(); -} - -wxString StackFramesList::getColumnText(int item, int col) const -{ - if (item < 0 || item >= (int)frames.size()) - return L""; - - FastFormatUnicode dest; - const MipsStackWalk::StackFrame& frame = frames[item]; - - switch (col) - { - case SF_ENTRY: - dest.Write("0x%08X", frame.entry); - break; - case SF_ENTRYNAME: - { - const std::string sym = cpu->GetSymbolMap().GetLabelString(frame.entry); - if (!sym.empty()) - { - dest.Write("%s", sym.c_str()); - } - else - { - dest.Write("-"); - } - } - break; - case SF_CURPC: - dest.Write("0x%08X", frame.pc); - break; - case SF_CUROPCODE: - { - if (!cpu->isAlive()) - break; - char temp[512]; - disassembly->getOpcodeText(frame.pc, temp); - dest.Write("%s", temp); - } - break; - case SF_CURSP: - dest.Write("0x%08X", frame.sp); - break; - case SF_FRAMESIZE: - dest.Write("0x%08X", frame.stackSize); - break; - default: - return L"Invalid"; - } - - return dest; -} - -void StackFramesList::onDoubleClick(int itemIndex, const wxPoint& point) -{ - if (itemIndex < 0 || itemIndex >= (int)frames.size()) - return; - - postEvent(debEVT_GOTOINDISASM, frames[itemIndex].pc); -} diff --git a/pcsx2/gui/Debugger/DebuggerLists.h b/pcsx2/gui/Debugger/DebuggerLists.h deleted file mode 100644 index d6a5a7f213..0000000000 --- a/pcsx2/gui/Debugger/DebuggerLists.h +++ /dev/null @@ -1,137 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include -#include "DebugTools/DebugInterface.h" -#include "DebugTools/Breakpoints.h" -#include "DebugTools/BiosDebugData.h" -#include "DebugTools/MipsStackWalk.h" -#include "CtrlDisassemblyView.h" - -struct GenericListViewColumn -{ - const wchar_t* name; - float size; -}; - -class GenericListView : public wxListView -{ -public: - GenericListView(wxWindow* parent, GenericListViewColumn* columns, int columnCount); - void update(); - - wxDECLARE_EVENT_TABLE(); - -protected: - void sizeEvent(wxSizeEvent& evt); - void keydownEvent(wxKeyEvent& evt); - void postEvent(wxEventType type, int value); - void mouseEvent(wxMouseEvent& evt); - void listEvent(wxListEvent& evt); - - [[nodiscard]] virtual wxString getColumnText(int row, int col) const = 0; - virtual int getRowCount() = 0; - virtual void onDoubleClick(int itemIndex, const wxPoint& point){}; - virtual void onRightClick(int itemIndex, const wxPoint& point){}; - virtual void onKeyDown(int key){}; - - // This flag prevents resizing loop in the resizeColumn method of this class - // when the Windows Classic theme with some large resolutions around larger - // than 1024 x 768 have been chosen. - // - // The resizing loop will occur by the ListView_SetColumnWidth macro in the - // Windows SDK called by the wxListCtrl::SetColumnWidth method when the - // conditions above have been chosen. - bool m_isInResizeColumn; - -private: - void insertColumns(GenericListViewColumn* columns, int count); - void resizeColumn(int col, int width); - void resizeColumns(int totalWidth); - [[nodiscard]] wxString OnGetItemText(long item, long col) const override; - - GenericListViewColumn* columns; - wxPoint clickPos; - bool dontResizeColumnsInSizeEventHandler; -}; - -class BreakpointList : public GenericListView -{ -public: - BreakpointList(wxWindow* parent, DebugInterface* _cpu, CtrlDisassemblyView* _disassembly); - void reloadBreakpoints(); - -protected: - void onPopupClick(wxCommandEvent& evt); - - [[nodiscard]] wxString getColumnText(int row, int col) const override; - int getRowCount() override; - void onDoubleClick(int itemIndex, const wxPoint& point) override; - void onRightClick(int itemIndex, const wxPoint& point) override; - void onKeyDown(int key) override; - -private: - int getBreakpointIndex(int itemIndex, bool& isMemory) const; - int getTotalBreakpointCount(); - void editBreakpoint(int itemIndex); - void toggleEnabled(int itemIndex); - void gotoBreakpointAddress(int itemIndex); - void removeBreakpoint(int itemIndex); - void showMenu(const wxPoint& pos); - - std::vector displayedBreakPoints_; - std::vector displayedMemChecks_; - DebugInterface* cpu; - CtrlDisassemblyView* disasm; -}; - -class ThreadList : public GenericListView -{ -public: - ThreadList(wxWindow* parent, DebugInterface* _cpu); - void reloadThreads(); - EEThread getRunningThread(); - -protected: - void onPopupClick(wxCommandEvent& evt); - - [[nodiscard]] wxString getColumnText(int row, int col) const override; - int getRowCount() override; - void onDoubleClick(int itemIndex, const wxPoint& point) override; - -private: - DebugInterface* cpu; - std::vector threads; -}; - -class StackFramesList : public GenericListView -{ -public: - StackFramesList(wxWindow* parent, DebugInterface* _cpu, CtrlDisassemblyView* _disassembly); - void loadStackFrames(EEThread& currentThread); - -protected: - void onPopupClick(wxCommandEvent& evt); - - [[nodiscard]] wxString getColumnText(int row, int col) const override; - int getRowCount() override; - void onDoubleClick(int itemIndex, const wxPoint& point) override; - -private: - DebugInterface* cpu; - CtrlDisassemblyView* disassembly; - std::vector frames; -}; diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp deleted file mode 100644 index b45065263d..0000000000 --- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp +++ /dev/null @@ -1,717 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "gui/App.h" -#include "gui/MainFrame.h" -#include "gui/PathDefs.h" -#include "DisassemblyDialog.h" -#include "DebugTools/DebugInterface.h" -#include "DebugTools/DisassemblyManager.h" -#include "DebugTools/Breakpoints.h" -#include "DebugTools/MipsStackWalk.h" -#include "BreakpointWindow.h" -#include "wx/busyinfo.h" - -#ifdef _WIN32 -#include -#endif - -wxBEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame) - EVT_COMMAND( wxID_ANY, debEVT_SETSTATUSBARTEXT, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_UPDATELAYOUT, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_GOTOADDRESS, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_GOTOINMEMORYVIEW, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_REFERENCEMEMORYVIEW, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_RUNTOPOS, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_GOTOINDISASM, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_STEPOVER, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_STEPINTO, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_STEPOUT, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_UPDATE, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_BREAKPOINTWINDOW, DisassemblyDialog::onDebuggerEvent ) - EVT_COMMAND( wxID_ANY, debEVT_MAPLOADED, DisassemblyDialog::onDebuggerEvent ) - EVT_SIZE(DisassemblyDialog::onSizeEvent) - EVT_CLOSE( DisassemblyDialog::onClose ) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(CpuTabPage, wxPanel) - EVT_LISTBOX_DCLICK( wxID_ANY, CpuTabPage::listBoxHandler) -wxEND_EVENT_TABLE() - -DebuggerHelpDialog::DebuggerHelpDialog(wxWindow* parent) - : wxDialog(parent, wxID_ANY, L"Help") -{ - wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); - - auto fileName = Path::CombineWx(PathDefs::GetDocs(), wxFileName(L"debugger.txt")); - - wxTextFile file(fileName); - wxString text(L""); - - if (file.Open()) - { - text = file.GetFirstLine(); - while (!file.Eof()) - { - text += file.GetNextLine() + L"\r\n"; - } - } - - wxTextCtrl* textControl = new wxTextCtrl(this, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); - textControl->SetMinSize(wxSize(650, 610)); - sizer->Add(textControl, 1, wxEXPAND); - - SetSizerAndFit(sizer); -} - - -CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu) - : wxPanel(parent), cpu(_cpu) -{ - wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); - SetSizer(mainSizer); - - leftTabs = new wxNotebook(this, wxID_ANY); - bottomTabs = new wxNotebook(this, wxID_ANY); - disassembly = new CtrlDisassemblyView(this, cpu); - registerList = new CtrlRegisterList(leftTabs, cpu); - functionList = new wxListBox(leftTabs, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxBORDER_NONE | wxLB_SORT); - - wxPanel* memoryPanel = new wxPanel(bottomTabs); - memory = new CtrlMemView(memoryPanel, cpu); - memorySearch = new CtrlMemSearch(memoryPanel, cpu); - - // create register list and disassembly section - wxBoxSizer* middleSizer = new wxBoxSizer(wxHORIZONTAL); - - wxBoxSizer* miscStuffSizer = new wxBoxSizer(wxHORIZONTAL); - cyclesText = new wxStaticText(this, wxID_ANY, L""); - miscStuffSizer->Add(cyclesText, 0, wxLEFT | wxTOP | wxBOTTOM, 2); - - leftTabs->AddPage(registerList, L"Registers"); - leftTabs->AddPage(functionList, L"Functions"); - - wxBoxSizer* registerSizer = new wxBoxSizer(wxVERTICAL); - registerSizer->Add(miscStuffSizer, 0); - registerSizer->Add(leftTabs, 1); - - middleSizer->Add(registerSizer, 0, wxEXPAND | wxRIGHT, 2); - middleSizer->Add(disassembly, 2, wxEXPAND); - mainSizer->Add(middleSizer, 3, wxEXPAND | wxBOTTOM, 3); - - wxBoxSizer *memorySizer = new wxBoxSizer(wxHORIZONTAL); - memorySizer->Add(memory, 1, wxEXPAND); -#ifdef _WIN32 - memorySearch->SetMaxSize(wxSize(310 * MSW_GetDPIScale(), -1)); -#else - memorySearch->SetMaxSize(wxSize(330, -1)); -#endif - memorySizer->Add(memorySearch, 1, wxEXPAND); - memoryPanel->SetSizer(memorySizer); - memoryPanel->SetBackgroundColour(wxTransparentColor); - - // create bottom section - bottomTabs->AddPage(memoryPanel, L"Memory"); - - breakpointList = new BreakpointList(bottomTabs, cpu, disassembly); - bottomTabs->AddPage(breakpointList, L"Breakpoints"); - - threadList = NULL; - stackFrames = NULL; - if (cpu == &r5900Debug) - { - threadList = new ThreadList(bottomTabs, cpu); - bottomTabs->AddPage(threadList, L"Threads"); - - stackFrames = new StackFramesList(bottomTabs, cpu, disassembly); - bottomTabs->AddPage(stackFrames, L"Stack frames"); - } - - mainSizer->Add(bottomTabs, 1, wxEXPAND); - - mainSizer->Layout(); - - symbolCount = 0; - - lastCycles = 0; - loadCycles(); -} - -void CpuTabPage::clearSymbolMap() -{ - symbolCount = 0; - functionList->Clear(); -} - -void CpuTabPage::reloadSymbolMap() -{ - if (!symbolCount) - { - auto funcs = cpu->GetSymbolMap().GetAllSymbols(ST_FUNCTION); - symbolCount = funcs.size(); - for (size_t i = 0; i < funcs.size(); i++) - { - wxString name = wxString(funcs[i].name.c_str(), wxConvUTF8); - functionList->Append(name, reinterpret_cast(static_cast(funcs[i].address))); - } - } -} - -void CpuTabPage::listBoxHandler(wxCommandEvent& event) -{ - int index = functionList->GetSelection(); - if (event.GetEventObject() == functionList && index >= 0) - { - uptr pos = (uptr)functionList->GetClientData(index); - postEvent(debEVT_GOTOINDISASM, pos); - } -} - -void CpuTabPage::postEvent(wxEventType type, int value) -{ - wxCommandEvent event(type, GetId()); - event.SetEventObject(this); - event.SetClientData(cpu); - event.SetInt(value); - wxPostEvent(this, event); -} - -void CpuTabPage::setBottomTabPage(wxWindow* win) -{ - for (size_t i = 0; i < bottomTabs->GetPageCount(); i++) - { - if (bottomTabs->GetPage(i) == win) - { - bottomTabs->SetSelection(i); - break; - } - } -} - -void CpuTabPage::update() -{ - breakpointList->reloadBreakpoints(); - - if (threadList != NULL && cpu->isAlive()) - { - threadList->reloadThreads(); - - EEThread thread = threadList->getRunningThread(); - if (thread.tid != -1) - stackFrames->loadStackFrames(thread); - } - Refresh(); -} - -void CpuTabPage::loadCycles() -{ - u32 cycles = cpu->getCycles(); - - wchar_t str[64]; - swprintf(str, 64, L"Ctr: %u", cycles - lastCycles); - cyclesText->SetLabel(str); - lastCycles = cycles; -} - -u32 CpuTabPage::getStepOutAddress() -{ - if (threadList == NULL) - return (u32)-1; - - EEThread currentThread = threadList->getRunningThread(); - std::vector frames = - MipsStackWalk::Walk(cpu, cpu->getPC(), cpu->getRegister(0, 31), cpu->getRegister(0, 29), - currentThread.data.entry_init, currentThread.data.stack); - - if (frames.size() < 2) - return (u32)-1; - - return frames[1].pc; -} - -DisassemblyDialog::DisassemblyDialog(wxWindow* parent) : - wxFrame(parent, wxID_ANY, L"Debugger", wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER | wxCLOSE_BOX | wxCAPTION | wxSYSTEM_MENU | wxMINIMIZE_BOX | wxMAXIMIZE_BOX), - currentCpu(NULL) -{ - int width = g_Conf->EmuOptions.Debugger.WindowWidth; - int height = g_Conf->EmuOptions.Debugger.WindowHeight; - - topSizer = new wxBoxSizer(wxVERTICAL); - wxPanel* panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("panel")); - panel->SetSizer(topSizer); - SetIcons(wxGetApp().GetIconBundle()); - - // create top row - wxBoxSizer* topRowSizer = new wxBoxSizer(wxHORIZONTAL); - - breakRunButton = new wxButton(panel, wxID_ANY, L"Run"); - Bind(wxEVT_BUTTON, &DisassemblyDialog::onBreakRunClicked, this, breakRunButton->GetId()); - breakRunButton->Enable(false); - topRowSizer->Add(breakRunButton); - - stepIntoButton = new wxButton(panel, wxID_ANY, L"Step Into" + wxString(" (F11)")); - stepIntoButton->Enable(false); - Bind(wxEVT_BUTTON, &DisassemblyDialog::onStepIntoClicked, this, stepIntoButton->GetId()); - topRowSizer->Add(stepIntoButton); - - stepOverButton = new wxButton(panel, wxID_ANY, L"Step Over" + wxString(" (F10)")); - stepOverButton->Enable(false); - Bind(wxEVT_BUTTON, &DisassemblyDialog::onStepOverClicked, this, stepOverButton->GetId()); - topRowSizer->Add(stepOverButton); - - stepOutButton = new wxButton(panel, wxID_ANY, L"Step Out"); - stepOutButton->Enable(false); - Bind(wxEVT_BUTTON, &DisassemblyDialog::onStepOutClicked, this, stepOutButton->GetId()); - topRowSizer->Add(stepOutButton); - - breakpointButton = new wxButton(panel, wxID_ANY, L"Breakpoint"); - Bind(wxEVT_BUTTON, &DisassemblyDialog::onBreakpointClicked, this, breakpointButton->GetId()); - topRowSizer->Add(breakpointButton); - - helpButton = new wxButton(panel, wxID_ANY, L"Help"); - Bind(wxEVT_BUTTON, &DisassemblyDialog::onHelpClicked, this, helpButton->GetId()); - topRowSizer->Add(helpButton); - - topSizer->Add(topRowSizer, 0, wxLEFT | wxRIGHT | wxTOP, 3); - - // create middle part of the window - middleBook = new wxNotebook(panel, wxID_ANY); - middleBook->SetBackgroundColour(wxColour(0xFFF0F0F0)); - eeTab = new CpuTabPage(middleBook, &r5900Debug); - iopTab = new CpuTabPage(middleBook, &r3000Debug); - middleBook->AddPage(eeTab, L"R5900"); - middleBook->AddPage(iopTab, L"R3000"); - Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, &DisassemblyDialog::onPageChanging, this, middleBook->GetId()); - topSizer->Add(middleBook, 3, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 3); - currentCpu = eeTab; - - CreateStatusBar(1); - - SetMinSize(wxSize(1000, 600)); - panel->GetSizer()->Fit(this); - - if (width != 0 && height != 0) - SetSize(width, height); - - setDebugMode(true, true); -} - -void DisassemblyDialog::onSizeEvent(wxSizeEvent& event) -{ - if (event.GetEventType() == wxEVT_SIZE) - { - g_Conf->EmuOptions.Debugger.WindowWidth = event.GetSize().x; - g_Conf->EmuOptions.Debugger.WindowHeight = event.GetSize().y; - } - - event.Skip(); -} - -void DisassemblyDialog::onBreakRunClicked(wxCommandEvent& evt) -{ - if (r5900Debug.isCpuPaused()) - { - // If the current PC is on a breakpoint, the user doesn't want to do nothing. - CBreakPoints::SetSkipFirst(BREAKPOINT_EE, r5900Debug.getPC()); - CBreakPoints::SetSkipFirst(BREAKPOINT_IOP, r3000Debug.getPC()); - r5900Debug.resumeCpu(); - } - else - { - r5900Debug.pauseCpu(); - gotoPc(); - } -} - -void DisassemblyDialog::onStepOverClicked(wxCommandEvent& evt) -{ - stepOver(); -} - -void DisassemblyDialog::onStepIntoClicked(wxCommandEvent& evt) -{ - stepInto(); -} - -void DisassemblyDialog::onStepOutClicked(wxCommandEvent& evt) -{ - stepOut(); -} - -void DisassemblyDialog::onHelpClicked(wxCommandEvent& evt) -{ - DebuggerHelpDialog help(this); - help.ShowModal(); -} - -void DisassemblyDialog::onPageChanging(wxCommandEvent& evt) -{ - wxNotebook* notebook = (wxNotebook*)wxWindow::FindWindowById(evt.GetId()); - wxWindow* currentPage = notebook->GetCurrentPage(); - - if (currentPage == eeTab) - currentCpu = eeTab; - else if (currentPage == iopTab) - currentCpu = iopTab; - else - currentCpu = NULL; - - if (currentCpu != NULL) - { - currentCpu->getDisassembly()->SetFocus(); - currentCpu->update(); - } -} - -void DisassemblyDialog::stepOver() -{ - if (!r5900Debug.isAlive() || !r5900Debug.isCpuPaused() || currentCpu == NULL) - return; - DebugInterface* debug = currentCpu->getCpu(); - - CtrlDisassemblyView* disassembly = currentCpu->getDisassembly(); - - // If the current PC is on a breakpoint, the user doesn't want to do nothing. - CBreakPoints::SetSkipFirst(debug->getCpuType(), debug->getPC()); - u32 currentPc = debug->getPC(); - - MIPSAnalyst::MipsOpcodeInfo info = MIPSAnalyst::GetOpcodeInfo(debug, debug->getPC()); - u32 breakpointAddress = currentPc + disassembly->getInstructionSizeAt(currentPc); - if (info.isBranch) - { - if (!info.isConditional) - { - if (info.isLinkedBranch) // jal, jalr - { - // it's a function call with a delay slot - skip that too - breakpointAddress += 4; - } - else // j, ... - { - // in case of absolute branches, set the breakpoint at the branch target - breakpointAddress = info.branchTarget; - } - } - else // beq, ... - { - if (info.conditionMet) - { - breakpointAddress = info.branchTarget; - } - else - { - breakpointAddress = currentPc + 2 * 4; - disassembly->scrollStepping(breakpointAddress); - } - } - } - else - { - disassembly->scrollStepping(breakpointAddress); - } - - CBreakPoints::AddBreakPoint(debug->getCpuType(), breakpointAddress, true); - r5900Debug.resumeCpu(); -} - - -void DisassemblyDialog::stepInto() -{ - if (!r5900Debug.isAlive() || !r5900Debug.isCpuPaused() || currentCpu == NULL) - return; - - DebugInterface* debug = currentCpu->getCpu(); - CtrlDisassemblyView* disassembly = currentCpu->getDisassembly(); - - // If the current PC is on a breakpoint, the user doesn't want to do nothing. - CBreakPoints::SetSkipFirst(debug->getCpuType(), debug->getPC()); - u32 currentPc = debug->getPC(); - - MIPSAnalyst::MipsOpcodeInfo info = MIPSAnalyst::GetOpcodeInfo(debug, debug->getPC()); - u32 breakpointAddress = currentPc + disassembly->getInstructionSizeAt(currentPc); - if (info.isBranch) - { - if (!info.isConditional) - { - breakpointAddress = info.branchTarget; - } - else - { - if (info.conditionMet) - { - breakpointAddress = info.branchTarget; - } - else - { - breakpointAddress = currentPc + 2 * 4; - disassembly->scrollStepping(breakpointAddress); - } - } - } - - if (info.isSyscall) - breakpointAddress = info.branchTarget; - - CBreakPoints::AddBreakPoint(debug->getCpuType(), breakpointAddress, true); - r5900Debug.resumeCpu(); -} - -void DisassemblyDialog::stepOut() -{ - if (!r5900Debug.isAlive() || !r5900Debug.isCpuPaused() || currentCpu == NULL) - return; - DebugInterface* debug = currentCpu->getCpu(); - // If the current PC is on a breakpoint, the user doesn't want to do nothing. - CBreakPoints::SetSkipFirst(debug->getCpuType(), debug->getPC()); - - u32 addr = currentCpu->getStepOutAddress(); - if (addr == (u32)-1) - return; - - CBreakPoints::AddBreakPoint(debug->getCpuType(), addr, true); - r5900Debug.resumeCpu(); -} - -void DisassemblyDialog::onBreakpointClicked(wxCommandEvent& evt) -{ - if (currentCpu == NULL) - return; - - BreakpointWindow bpw(this, currentCpu->getCpu()); - if (bpw.ShowModal() == wxID_OK) - { - bpw.addBreakpoint(); - update(); - } -} - -void DisassemblyDialog::onDebuggerEvent(wxCommandEvent& evt) -{ - wxEventType type = evt.GetEventType(); - - if (type == debEVT_SETSTATUSBARTEXT) - { - DebugInterface* cpu = reinterpret_cast(evt.GetClientData()); - if (cpu != NULL && currentCpu != NULL && cpu == currentCpu->getCpu()) - GetStatusBar()->SetLabel(evt.GetString()); - } - else if (type == debEVT_UPDATELAYOUT) - { - if (currentCpu != NULL) - currentCpu->GetSizer()->Layout(); - topSizer->Layout(); - update(); - } - else if (type == debEVT_GOTOADDRESS) - { - DebugInterface* cpu = reinterpret_cast(evt.GetClientData()); - u64 addr; - if (!executeExpressionWindow(this, cpu, addr)) - return; - - if (currentCpu != NULL) - { - // GetInt() is 0 when called by the disassembly view, 1 when called by the memory view - if (!evt.GetInt()) - currentCpu->getDisassembly()->gotoAddress(addr); - else - currentCpu->getMemoryView()->gotoAddress(addr); - } - update(); - } - else if (type == debEVT_GOTOINMEMORYVIEW) - { - if (currentCpu != NULL) - { - currentCpu->showMemoryView(); - - currentCpu->getMemoryView()->gotoAddress(evt.GetInt(), true); - currentCpu->getDisassembly()->SetFocus(); - } - } - else if (type == debEVT_REFERENCEMEMORYVIEW) - { - if (currentCpu != NULL) - { - currentCpu->getMemoryView()->updateReference(evt.GetInt()); - } - } - else if (type == debEVT_RUNTOPOS) - { - CBreakPoints::AddBreakPoint(currentCpu->getCpu()->getCpuType(), evt.GetInt(), true); - currentCpu->getCpu()->resumeCpu(); - } - else if (type == debEVT_GOTOINDISASM) - { - if (currentCpu != NULL) - { - u32 pos = evt.GetInt(); - currentCpu->getDisassembly()->gotoAddress(pos); - currentCpu->getDisassembly()->SetFocus(); - update(); - } - } - else if (type == debEVT_STEPOVER) - { - if (currentCpu != NULL) - stepOver(); - } - else if (type == debEVT_STEPINTO) - { - if (currentCpu != NULL) - stepInto(); - } - else if (type == debEVT_UPDATE) - { - update(); - } - else if (type == debEVT_BREAKPOINTWINDOW) - { - wxCommandEvent evt; - onBreakpointClicked(evt); - } - else if (type == debEVT_MAPLOADED) - { - wxBusyInfo wait("Please wait, Reloading ELF functions"); - eeTab->clearSymbolMap(); - iopTab->clearSymbolMap(); - eeTab->reloadSymbolMap(); - iopTab->reloadSymbolMap(); - } - else if (type == debEVT_STEPOUT) - { - if (currentCpu != NULL) - stepOut(); - } -} - -void DisassemblyDialog::onClose(wxCloseEvent& evt) -{ - auto* mainFrame = GetMainFramePtr(); - - Hide(); - mainFrame->CheckMenuItem(MenuId_Debug_Open, false); -} - -void DisassemblyDialog::update() -{ - if (currentCpu != NULL) - { - stepOverButton->Enable(true); - breakpointButton->Enable(true); - currentCpu->update(); - } - else - { - stepOverButton->Enable(false); - breakpointButton->Enable(false); - } -} - -void DisassemblyDialog::reset() -{ - eeTab->getDisassembly()->clearFunctions(); - eeTab->clearSymbolMap(); - iopTab->getDisassembly()->clearFunctions(); - iopTab->clearSymbolMap(); -} - -void DisassemblyDialog::populate() -{ - eeTab->reloadSymbolMap(); - iopTab->reloadSymbolMap(); -} - -void DisassemblyDialog::gotoPc() -{ - eeTab->getDisassembly()->gotoPc(); - iopTab->getDisassembly()->gotoPc(); -} - -void DisassemblyDialog::setDebugMode(bool debugMode, bool switchPC) -{ - bool running = r5900Debug.isAlive(); - - eeTab->Enable(running); - iopTab->Enable(running); - - if (running) - { - breakRunButton->Enable(true); - - if (currentCpu == NULL) - { - wxWindow* currentPage = middleBook->GetCurrentPage(); - - if (currentPage == eeTab) - currentCpu = eeTab; - else if (currentPage == iopTab) - currentCpu = iopTab; - - if (currentCpu != NULL) - currentCpu->update(); - } - - if (debugMode) - { - if (!CBreakPoints::GetBreakpointTriggered()) - { - wxBusyInfo wait("Please wait, Reading ELF functions"); - populate(); - } - CBreakPoints::ClearTemporaryBreakPoints(); - breakRunButton->SetLabel(L"Run"); - - stepOverButton->Enable(true); - stepIntoButton->Enable(true); - stepOutButton->Enable(currentCpu == eeTab); - - if (switchPC || CBreakPoints::GetBreakpointTriggered()) - gotoPc(); - - if (CBreakPoints::GetBreakpointTriggered()) - { - if (currentCpu != NULL) - currentCpu->getDisassembly()->SetFocus(); - CBreakPoints::SetBreakpointTriggered(false); - CBreakPoints::SetSkipFirst(BREAKPOINT_EE, 0); - CBreakPoints::SetSkipFirst(BREAKPOINT_IOP, 0); - } - - if (currentCpu != NULL) - currentCpu->loadCycles(); - } - else - { - breakRunButton->SetLabel(L"Break"); - - stepIntoButton->Enable(false); - stepOverButton->Enable(false); - stepOutButton->Enable(false); - } - } - else - { - breakRunButton->SetLabel(L"Run"); - stepIntoButton->Enable(false); - stepOverButton->Enable(false); - stepOutButton->Enable(false); - currentCpu = NULL; - } - - update(); -} diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.h b/pcsx2/gui/Debugger/DisassemblyDialog.h deleted file mode 100644 index 136103d979..0000000000 --- a/pcsx2/gui/Debugger/DisassemblyDialog.h +++ /dev/null @@ -1,122 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once -#include -#include -#include "gui/App.h" - -#include "CtrlDisassemblyView.h" -#include "CtrlRegisterList.h" -#include "CtrlMemView.h" -#include "CtrlMemSearch.h" -#include "DebugEvents.h" -#include "DebuggerLists.h" -#include "gui/MSWstuff.h" - -class DebuggerHelpDialog: public wxDialog -{ -public: - DebuggerHelpDialog(wxWindow* parent); -}; - -inline int getDebugFontWidth() -{ - return (int) ceil(g_Conf->EmuOptions.Debugger.FontWidth*MSW_GetDPIScale()); -} - -inline int getDebugFontHeight() -{ - return (int)ceil(g_Conf->EmuOptions.Debugger.FontHeight*MSW_GetDPIScale()); -} - -class CpuTabPage: public wxPanel -{ -public: - CpuTabPage(wxWindow* parent, DebugInterface* _cpu); - DebugInterface* getCpu() { return cpu; }; - CtrlDisassemblyView* getDisassembly() { return disassembly; }; - CtrlRegisterList* getRegisterList() { return registerList; }; - CtrlMemView* getMemoryView() { return memory; }; - CtrlMemSearch* getMemorySearch() { return memorySearch; }; - wxNotebook* getBottomTabs() { return bottomTabs; }; - void update(); - void showMemoryView() { setBottomTabPage(memory); }; - void loadCycles(); - void reloadSymbolMap(); - void clearSymbolMap(); - u32 getStepOutAddress(); - - void listBoxHandler(wxCommandEvent& event); - wxDECLARE_EVENT_TABLE(); -private: - void setBottomTabPage(wxWindow* win); - void postEvent(wxEventType type, int value); - - DebugInterface* cpu; - CtrlDisassemblyView* disassembly; - CtrlRegisterList* registerList; - wxListBox* functionList; - CtrlMemView* memory; - CtrlMemSearch* memorySearch; - wxNotebook* bottomTabs; - wxNotebook* leftTabs; - BreakpointList* breakpointList; - wxStaticText* cyclesText; - ThreadList* threadList; - StackFramesList* stackFrames; - u32 lastCycles; - u32 symbolCount; -}; - -class DisassemblyDialog : public wxFrame -{ -public: - DisassemblyDialog( wxWindow* parent=NULL ); - virtual ~DisassemblyDialog() = default; - - static wxString GetNameStatic() { return L"DisassemblyDialog"; } - wxString GetDialogName() const { return GetNameStatic(); } - - void update(); - void reset(); - void populate(); - void setDebugMode(bool debugMode, bool switchPC); - - wxDECLARE_EVENT_TABLE(); -protected: - void onBreakRunClicked(wxCommandEvent& evt); - void onStepOverClicked(wxCommandEvent& evt); - void onStepIntoClicked(wxCommandEvent& evt); - void onStepOutClicked(wxCommandEvent& evt); - void onHelpClicked(wxCommandEvent& evt); - void onDebuggerEvent(wxCommandEvent& evt); - void onPageChanging(wxCommandEvent& evt); - void onBreakpointClicked(wxCommandEvent& evt); - void onSizeEvent(wxSizeEvent& event); - void onClose(wxCloseEvent& evt); - void stepOver(); - void stepInto(); - void stepOut(); - void gotoPc(); -private: - CpuTabPage* eeTab; - CpuTabPage* iopTab; - CpuTabPage* currentCpu; - wxNotebook* middleBook; - - wxBoxSizer* topSizer; - wxButton *breakRunButton, *stepIntoButton, *stepOverButton, *stepOutButton, *breakpointButton, *helpButton; -}; diff --git a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp deleted file mode 100644 index b6adb6c6fd..0000000000 --- a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "gui/AppCommon.h" -#include "gui/MSWstuff.h" - -#include "gui/Dialogs/ModalPopups.h" - -#include "gui/EmbeddedImage.h" -#include "gui/Resources/Logo.h" - -#include -#include - -using namespace pxSizerFlags; - -// -------------------------------------------------------------------------------------- -// AboutBoxDialog Implementation -// -------------------------------------------------------------------------------------- - -Dialogs::AboutBoxDialog::AboutBoxDialog(wxWindow* parent) - : wxDialogWithHelpers(parent, AddAppName(_("About %s")), pxDialogFlags()) -{ - const float scale = MSW_GetDPIScale(); - SetMinWidth(scale * 460); - - wxImage img = EmbeddedImage().Get(); - img.Rescale(img.GetWidth() * scale, img.GetHeight() * scale, wxIMAGE_QUALITY_HIGH); - auto bitmap_logo = new wxStaticBitmap(this, wxID_ANY, wxBitmap(img)); - - *this += bitmap_logo | StdCenter(); - -#ifdef _WIN32 - const int padding = 15; -#else - const int padding = 8; -#endif - - wxBoxSizer& general(*new wxBoxSizer(wxHORIZONTAL)); - general += new wxHyperlinkCtrl(this, wxID_ANY, _("Website"), L"https://pcsx2.net"); - general += padding; - general += new wxHyperlinkCtrl(this, wxID_ANY, _("Support Forums"), L"https://forums.pcsx2.net"); - general += padding; - general += new wxHyperlinkCtrl(this, wxID_ANY, _("GitHub Repository"), L"https://github.com/PCSX2/pcsx2"); - general += padding; - general += new wxHyperlinkCtrl(this, wxID_ANY, _("License"), L"https://github.com/PCSX2/pcsx2/blob/master/pcsx2/Docs/License.txt"); - - *this += Text(_("PlayStation 2 Emulator:")); - *this += general | StdCenter(); - *this += Text(_("Big thanks to everyone who contributed to the project throughout the years.")); - - wxButton& closeButton = *new wxButton(this, wxID_OK, _("Close")); - closeButton.SetFocus(); - *this += closeButton | StdCenter(); - - SetSizerAndFit(GetSizer()); -} diff --git a/pcsx2/gui/Dialogs/AssertionDialog.cpp b/pcsx2/gui/Dialogs/AssertionDialog.cpp deleted file mode 100644 index 4a4b121191..0000000000 --- a/pcsx2/gui/Dialogs/AssertionDialog.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "ModalPopups.h" -#include "gui/MSWstuff.h" - -using namespace pxSizerFlags; - -Dialogs::AssertionDialog::AssertionDialog( const wxString& text, const wxString& stacktrace ) - : wxDialogWithHelpers( NULL, _("Assertion Failure - ") + pxGetAppName(), pxDialogFlags().Resize(!stacktrace.IsEmpty()) ) -{ - SetMinWidth( MSW_GetDPIScale() * 720 ); - - wxFlexGridSizer* flexgrid = new wxFlexGridSizer( 1 ); - flexgrid->AddGrowableCol( 0 ); - SetSizer( flexgrid ); - - wxTextCtrl* traceArea = NULL; - - if( !stacktrace.IsEmpty() ) - { - flexgrid->AddGrowableRow( 1 ); - - traceArea = new wxTextCtrl( - this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxTE_READONLY | wxTE_MULTILINE | wxTE_RICH2 | wxHSCROLL - ); - - traceArea->SetDefaultStyle( wxTextAttr( wxNullColour, wxNullColour, pxGetFixedFont() ) ); - traceArea->SetFont( pxGetFixedFont() ); - - int fonty = traceArea->GetCharHeight(); - - traceArea->WriteText( stacktrace ); - traceArea->SetMinSize( wxSize( traceArea->GetMinWidth(), (fonty+1)*18 ) ); - traceArea->SetInsertionPoint( 0 ); - traceArea->ShowPosition( 0 ); - } - - *this += Heading( text ) | StdExpand(); - - if( traceArea != NULL ) *this += traceArea | pxExpand.Border(wxTOP|wxLEFT|wxRIGHT,8); - - *this += Heading( - L"\nDo you want to stop the program [Yes/No]?" - L"\nOr press [Ignore] to suppress further assertions." - ) | StdExpand(); - - *this += new ModalButtonPanel( this, MsgButtons().YesNo().Ignore() ) | StdCenter(); - - if( wxWindow* idyes = FindWindowById( wxID_YES ) ) - idyes->SetFocus(); -} - diff --git a/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp b/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp deleted file mode 100644 index 8673504523..0000000000 --- a/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp +++ /dev/null @@ -1,304 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "System.h" -#include "gui/App.h" -#include "gui/MSWstuff.h" - -#include "ConfigurationDialog.h" -#include "ModalPopups.h" -#include "gui/Panels/ConfigurationPanels.h" - -#include -#include -#include -#include - -wxDEFINE_EVENT(pxEvt_ApplySettings, wxCommandEvent); -wxDEFINE_EVENT(pxEvt_SetSettingsPage, wxCommandEvent); -wxDEFINE_EVENT(pxEvt_SomethingChanged, wxCommandEvent); - -using namespace Panels; - -// configure the orientation of the listbox based on the platform -// For now, they're all on the left. -static const int s_orient = wxLB_LEFT; - - -class ScopedOkButtonDisabler -{ -protected: - Dialogs::BaseConfigurationDialog* m_parent; - - wxWindow* m_apply; - wxWindow* m_ok; - wxWindow* m_cancel; - -public: - ScopedOkButtonDisabler( Dialogs::BaseConfigurationDialog* parent ) - { - m_parent = parent; - m_parent->AllowApplyActivation( false ); - - m_apply = m_parent->FindWindow( wxID_APPLY ); - m_ok = m_parent->FindWindow( wxID_OK ); - m_cancel = m_parent->FindWindow( wxID_CANCEL ); - - if (m_apply) m_apply ->Disable(); - if (m_ok) m_ok ->Disable(); - if (m_cancel) m_cancel->Disable(); - } - - // Use this to prevent the Apply button from being re-enabled. - void DetachApply() - { - m_apply = NULL; - } - - void DetachAll() - { - m_apply = m_ok = m_cancel = NULL; - } - - virtual ~ScopedOkButtonDisabler() - { - if (m_apply) m_apply ->Enable(); - if (m_ok) m_ok ->Enable(); - if (m_cancel) m_cancel->Enable(); - - m_parent->AllowApplyActivation( true ); - } -}; - -// -------------------------------------------------------------------------------------- -// BaseApplicableDialog (implementations) -// -------------------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(BaseApplicableDialog, wxDialogWithHelpers); - -BaseApplicableDialog::BaseApplicableDialog( wxWindow* parent, const wxString& title, const pxDialogCreationFlags& cflags ) - : wxDialogWithHelpers( parent, title, cflags.MinWidth(425).Minimize() ) -{ - Init(); -} - -BaseApplicableDialog::~BaseApplicableDialog() -{ - m_ApplyState.DoCleanup(); -} - -wxString BaseApplicableDialog::GetDialogName() const -{ - pxFailDev( "This class must implement GetDialogName!" ); - return L"Unnamed"; -} - - -void BaseApplicableDialog::Init() -{ - Bind(pxEvt_ApplySettings, &BaseApplicableDialog::OnSettingsApplied, this); - - wxCommandEvent applyEvent( pxEvt_ApplySettings ); - applyEvent.SetId( GetId() ); - AddPendingEvent( applyEvent ); -} - -void BaseApplicableDialog::OnSettingsApplied( wxCommandEvent& evt ) -{ - evt.Skip(); - if( evt.GetId() == GetId() ) - AppStatusEvent_OnSettingsApplied(); -} - - -// -------------------------------------------------------------------------------------- -// BaseConfigurationDialog Implementations -// -------------------------------------------------------------------------------------- -Dialogs::BaseConfigurationDialog::BaseConfigurationDialog( wxWindow* parent, const wxString& title, int idealWidth ) - : _parent( parent, title ) -{ - float scale = MSW_GetDPIScale(); - - SetMinWidth( scale * idealWidth ); - m_listbook = NULL; - m_allowApplyActivation = true; - - Bind(wxEVT_BUTTON, &BaseConfigurationDialog::OnOk_Click, this, wxID_OK); - Bind(wxEVT_BUTTON, &BaseConfigurationDialog::OnCancel_Click, this, wxID_CANCEL); - Bind(wxEVT_BUTTON, &BaseConfigurationDialog::OnApply_Click, this, wxID_APPLY); - Bind(wxEVT_BUTTON, &BaseConfigurationDialog::OnScreenshot_Click, this, wxID_SAVE); - - Bind(pxEvt_SetSettingsPage, &BaseConfigurationDialog::OnSetSettingsPage, this); - - // ---------------------------------------------------------------------------- - // Bind a variety of standard "something probably changed" events. If the user invokes - // any of these, we'll automatically de-gray the Apply button for this dialog box. :) - - Bind(wxEVT_TEXT, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_TEXT_ENTER, &BaseConfigurationDialog::OnSomethingChanged, this); - - Bind(wxEVT_RADIOBUTTON, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_COMBOBOX, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_CHECKBOX, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_BUTTON, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_CHOICE, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_LISTBOX, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_SPINCTRL, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_SLIDER, &BaseConfigurationDialog::OnSomethingChanged, this); - Bind(wxEVT_DIRPICKER_CHANGED, &BaseConfigurationDialog::OnSomethingChanged, this); - - Bind(pxEvt_SomethingChanged, &BaseConfigurationDialog::OnSomethingChanged, this); -} - -void Dialogs::BaseConfigurationDialog::AddListbook( wxSizer* sizer ) -{ - if( !sizer ) sizer = GetSizer(); - *sizer += m_listbook | pxExpand.Border( wxLEFT | wxRIGHT, 2 ); -} - -void Dialogs::BaseConfigurationDialog::CreateListbook( wxImageList& bookicons ) -{ - m_listbook = new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, s_orient ); - m_listbook->SetImageList( &bookicons ); - m_ApplyState.StartBook( m_listbook ); -} - -void Dialogs::BaseConfigurationDialog::AddOkCancel( wxSizer* sizer ) -{ - _parent::AddOkCancel( sizer, true ); - if( wxWindow* apply = FindWindow( wxID_APPLY ) ) apply->Disable(); - SomethingChanged_StateModified_IsChanged(); - - wxBitmapButton& screenshotButton(*new wxBitmapButton(this, wxID_SAVE, wxGetApp().GetScreenshotBitmap())); - screenshotButton.SetToolTip( _("Saves a snapshot of this settings panel to a PNG file.") ); - - *m_extraButtonSizer += screenshotButton|pxMiddle; -} - -void Dialogs::BaseConfigurationDialog::OnSetSettingsPage( wxCommandEvent& evt ) -{ - if( !m_listbook ) return; - - size_t pages = m_labels.GetCount(); - - for( size_t i=0; iSetSelection( i ); - break; - } - } -} - -void Dialogs::BaseConfigurationDialog::SomethingChanged() -{ - if( wxWindow* apply = FindWindow( wxID_APPLY ) ) apply->Enable(); - SomethingChanged_StateModified_IsChanged(); -} - -void Dialogs::BaseConfigurationDialog::OnSomethingChanged( wxCommandEvent& evt ) -{ - evt.Skip(); - if (!m_allowApplyActivation) return; - if ((evt.GetId() != wxID_OK) && (evt.GetId() != wxID_CANCEL) && (evt.GetId() != wxID_APPLY)) - SomethingChanged(); -} - -void Dialogs::BaseConfigurationDialog::AllowApplyActivation( bool allow ) -{ - m_allowApplyActivation = allow; -} - -void Dialogs::BaseConfigurationDialog::OnOk_Click( wxCommandEvent& evt ) -{ - ScopedOkButtonDisabler disabler(this); - - //same as for OnApply_Click - Apply(); - - if( m_ApplyState.ApplyAll() ) - { - if( wxWindow* apply = FindWindow( wxID_APPLY ) ) apply->Disable(); - SomethingChanged_StateModified_IsChanged(); - if( m_listbook ) GetConfSettingsTabName() = m_labels[m_listbook->GetSelection()]; - AppSaveSettings(); - disabler.DetachAll(); - evt.Skip(); - } -} - -void Dialogs::BaseConfigurationDialog::OnApply_Click( wxCommandEvent& evt ) -{ - ScopedOkButtonDisabler disabler(this); - - //if current instance also holds settings that need to be applied, apply them. - //Currently only used by SysConfigDialog, which applies the preset and derivatives (menu system). - //Needs to come before actual panels Apply since they enable/disable themselves upon Preset state, - // so the preset needs to be applied first. - Apply(); - - if( m_ApplyState.ApplyAll() ) - disabler.DetachApply(); - - if( m_listbook ) GetConfSettingsTabName() = m_labels[m_listbook->GetSelection()]; - AppSaveSettings(); - - SomethingChanged_StateModified_IsChanged(); -} - -void Dialogs::BaseConfigurationDialog::OnCancel_Click( wxCommandEvent& evt ) -{ - //same as for Ok/Apply: let SysConfigDialog clean-up the presets and derivatives (menu system) if needed. - Cancel(); - - evt.Skip(); - if( m_listbook ) GetConfSettingsTabName() = m_labels[m_listbook->GetSelection()]; -} - -void Dialogs::BaseConfigurationDialog::OnScreenshot_Click( wxCommandEvent& evt ) -{ - wxBitmap memBmp; - - { - wxWindowDC dc( this ); - wxSize dcsize( dc.GetSize() ); - wxMemoryDC memDC( memBmp = wxBitmap( dcsize.x, dcsize.y ) ); - memDC.Blit( wxPoint(), dcsize, &dc, wxPoint() ); - } - - wxString pagename( m_listbook ? (L"_" + m_listbook->GetPageText( m_listbook->GetSelection() )) : wxString() ); - wxString filenameDefault; - filenameDefault.Printf( L"%s_%s%s.png", pxGetAppName().Lower().c_str(), GetDialogName().c_str(), pagename.c_str() ); - filenameDefault.Replace( L"/", L"-" ); - - wxString filename( wxFileSelector( _("Save dialog screenshots to..."), g_Conf->Folders.Snapshots.ToString(), - filenameDefault, L"png", wxEmptyString, wxFD_SAVE | wxFD_OVERWRITE_PROMPT, this ) ); - - if( !filename.IsEmpty() ) - { - ScopedBusyCursor busy( Cursor_ReallyBusy ); -#ifdef __WXMSW__ - // HACK: This works around an actual wx3.0 bug at the cost of icon - // quality. See http://trac.wxwidgets.org/ticket/14403 . - wxImage image = memBmp.ConvertToImage(); - if (image.HasAlpha()) - image.ClearAlpha(); - image.SaveFile( filename, wxBITMAP_TYPE_PNG ); -#else - memBmp.SaveFile( filename, wxBITMAP_TYPE_PNG ); -#endif - } -} diff --git a/pcsx2/gui/Dialogs/BaseConfigurationDialog.inl b/pcsx2/gui/Dialogs/BaseConfigurationDialog.inl deleted file mode 100644 index 3aca3a124d..0000000000 --- a/pcsx2/gui/Dialogs/BaseConfigurationDialog.inl +++ /dev/null @@ -1,27 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - -template< typename T > -void Dialogs::BaseConfigurationDialog::AddPage( const wxChar* label, int iconid ) -{ - const int curidx = m_labels.Add( label ); - m_ApplyState.SetCurrentPage( curidx ); - m_listbook->AddPage( new T( m_listbook ), wxGetTranslation( label ), - ( 0 == GetConfSettingsTabName().CmpNoCase(label) ), iconid ); -} diff --git a/pcsx2/gui/Dialogs/ConfigurationDialog.h b/pcsx2/gui/Dialogs/ConfigurationDialog.h deleted file mode 100644 index a81ac61892..0000000000 --- a/pcsx2/gui/Dialogs/ConfigurationDialog.h +++ /dev/null @@ -1,207 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include - -#include "gui/AppCommon.h" -#include "gui/ApplyState.h" -#include "gui/App.h" - -namespace Panels -{ - class BaseSelectorPanel; - class McdConfigPanel_Toggles; - class BaseMcdListPanel; -} - -wxDECLARE_EVENT(pxEvt_SomethingChanged, wxCommandEvent); - -namespace Dialogs -{ - // -------------------------------------------------------------------------------------- - // BaseConfigurationDialog - // -------------------------------------------------------------------------------------- - class BaseConfigurationDialog : public BaseApplicableDialog - { - typedef BaseApplicableDialog _parent; - - protected: - wxListbook* m_listbook; - wxArrayString m_labels; - bool m_allowApplyActivation; - - public: - virtual ~BaseConfigurationDialog() = default; - BaseConfigurationDialog(wxWindow* parent, const wxString& title, int idealWidth); - - public: - void AddOkCancel( wxSizer* sizer=NULL ); - void AddListbook( wxSizer* sizer=NULL ); - void CreateListbook( wxImageList& bookicons ); - - virtual void SomethingChanged(); - - template< typename T > - void AddPage( const wxChar* label, int iconid ); - - void AllowApplyActivation( bool allow=true ); - virtual bool SomethingChanged_StateModified_IsChanged(){ //returns the state of the apply button. - if( wxWindow* apply = FindWindow( wxID_APPLY ) ) - return apply->IsEnabled(); - return false; - } - - protected: - void OnOk_Click( wxCommandEvent& evt ); - void OnCancel_Click( wxCommandEvent& evt ); - void OnApply_Click( wxCommandEvent& evt ); - void OnScreenshot_Click( wxCommandEvent& evt ); - - void OnSetSettingsPage( wxCommandEvent& evt ); - void OnSomethingChanged( wxCommandEvent& evt ); - - virtual wxString& GetConfSettingsTabName() const=0; - - virtual void Apply() {}; - virtual void Cancel() {}; - }; - - // -------------------------------------------------------------------------------------- - // SysConfigDialog - // -------------------------------------------------------------------------------------- - class SysConfigDialog : public BaseConfigurationDialog - { - public: - virtual ~SysConfigDialog() = default; - SysConfigDialog(wxWindow* parent=NULL); - static wxString GetNameStatic() { return L"CoreSettings"; } - wxString GetDialogName() const { return GetNameStatic(); } - void Apply(); - void Cancel(); - - //Stores the state of the apply button in a global var. - //This var will be used by KB shortcuts commands to decide if the gui should be modified (only when no intermediate changes) - virtual bool SomethingChanged_StateModified_IsChanged(){ - return g_ConfigPanelChanged = BaseConfigurationDialog::SomethingChanged_StateModified_IsChanged(); - } - - protected: - virtual wxString& GetConfSettingsTabName() const { return g_Conf->SysSettingsTabName; } - - pxCheckBox* m_check_presets; - wxSlider* m_slider_presets; - pxStaticText* m_msg_preset; - void AddPresetsControl(); - void Preset_Scroll(wxScrollEvent &event); - void Presets_Toggled(wxCommandEvent &event); - void UpdateGuiForPreset ( int presetIndex, bool presetsEnabled ); - }; - - // -------------------------------------------------------------------------------------- - // InterfaceLanguageDialog - // -------------------------------------------------------------------------------------- - class InterfaceLanguageDialog : public BaseConfigurationDialog - { - public: - InterfaceLanguageDialog(wxWindow* parent = NULL); - virtual ~InterfaceLanguageDialog() = default; - - static wxString GetNameStatic() { return L"InterfaceLanguage"; } - wxString GetDialogName() const { return GetNameStatic(); } - - protected: - virtual wxString& GetConfSettingsTabName() const { return g_Conf->AppSettingsTabName; } - }; - - - // -------------------------------------------------------------------------------------- - // McdConfigDialog - // -------------------------------------------------------------------------------------- - class McdConfigDialog : public BaseConfigurationDialog - { - typedef BaseConfigurationDialog _parent; - - protected: - Panels::BaseMcdListPanel* m_panel_mcdlist; - - public: - virtual ~McdConfigDialog() = default; - McdConfigDialog(wxWindow* parent=NULL); - static wxString GetNameStatic() { return L"McdConfig"; } - wxString GetDialogName() const { return GetNameStatic(); } - - protected: - virtual wxString& GetConfSettingsTabName() const { return g_Conf->McdSettingsTabName; } - //void OnMultitapClicked( wxCommandEvent& evt ); - }; - - // -------------------------------------------------------------------------------------- - // CreateMemoryCardDialog - // -------------------------------------------------------------------------------------- - class CreateMemoryCardDialog : public wxDialogWithHelpers - { - protected: - wxDirName m_mcdpath; - wxString m_mcdfile; - wxTextCtrl* m_text_filenameInput; - wxStaticText *m_mcd_Extension; - - //wxFilePickerCtrl* m_filepicker; - pxRadioPanel *m_radio_CardType; - -#ifdef __WXMSW__ - pxCheckBox *m_check_CompressNTFS; -#endif - - public: - virtual ~CreateMemoryCardDialog() = default; - CreateMemoryCardDialog( wxWindow* parent, const wxDirName& mcdpath, const wxString& suggested_mcdfileName); - - //duplicate of MemoryCardFile::Create. Don't know why the existing method isn't used. - avih - static bool CreateIt( const wxString& mcdFile, uint sizeInMB, bool isPSX ); - wxString result_createdMcdFilename; - //wxDirName GetPathToMcds() const; - - protected: - void CreateControls(); - void OnRadioChanged(wxCommandEvent &evt); - void OnOk_Click(wxCommandEvent &evt); - }; - - // -------------------------------------------------------------------------------------- - // ConvertMemoryCardDialog - // -------------------------------------------------------------------------------------- - class ConvertMemoryCardDialog : public wxDialogWithHelpers - { - protected: - wxDirName m_mcdPath; - wxString m_mcdSourceFilename; - wxTextCtrl *m_text_filenameInput; - pxRadioPanel *m_radio_CardType; - - public: - virtual ~ConvertMemoryCardDialog() = default; - ConvertMemoryCardDialog( wxWindow* parent, const wxDirName& mcdPath, MemoryCardType type, const wxString& sourceFilename ); - - protected: - void CreateControls( const MemoryCardType sourceType ); - void OnOk_Click( wxCommandEvent& evt ); - bool ConvertToFile( const wxFileName& sourcePath, const wxFileName& targetPath, const u32 sizeInMB ); - bool ConvertToFolder( const wxFileName& sourcePath, const wxFileName& targetPath ); - }; -} diff --git a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp b/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp deleted file mode 100644 index 5fc949d9f2..0000000000 --- a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp +++ /dev/null @@ -1,322 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "System.h" -#include "gui/App.h" -#include "gui/MSWstuff.h" - -#include "ModalPopups.h" -#include "gui/StringHelpers.h" - -using namespace pxSizerFlags; - -bool MsgButtons::Allows( wxWindowID id ) const -{ - switch( id ) - { - case wxID_OK: return HasOK(); - case wxID_CANCEL: return HasCancel(); - case wxID_APPLY: return HasApply(); - case wxID_YES: return HasYes(); - case wxID_NO: return HasNo(); - case wxID_YESTOALL: return HasYes() && AllowsToAll(); - case wxID_NOTOALL: return HasNo() && AllowsToAll(); - - case wxID_ABORT: return HasAbort(); - case wxID_RETRY: return HasRetry(); - - // [TODO] : maybe add in an Ignore All? - case wxID_IGNORE: return HasIgnore(); - - case wxID_RESET: return HasReset(); - case wxID_CLOSE: return HasClose(); - } - - if (id <= wxID_LOWEST) - return HasCustom(); - - return false; -} - -static wxString ResultToString( int result, const MsgButtons& buttons ) -{ - switch( result ) - { - case wxID_OK: return L"ok"; - case wxID_CANCEL: return L"cancel"; - case wxID_APPLY: return L"apply"; - case wxID_YES: return L"yes"; - case wxID_NO: return L"no"; - case wxID_YESTOALL: return L"yestoall"; - case wxID_NOTOALL: return L"notoall"; - - case wxID_ABORT: return L"abort"; - case wxID_RETRY: return L"retry"; - - // [TODO] : maybe add in an Ignore All? - case wxID_IGNORE: return L"ignore"; - - case wxID_RESET: return L"reset"; - case wxID_CLOSE: return L"close"; - } - - if (result <= wxID_LOWEST) - return buttons.GetCustomLabelId(); - - return wxEmptyString; -} - -static wxWindowID ParseThatResult( const wxString& src, const MsgButtons& validTypes ) -{ - if( !pxAssert( !src.IsEmpty() ) ) return wxID_ANY; - - static const wxWindowID retvals[] = - { - wxID_OK, wxID_CANCEL, wxID_APPLY, - wxID_YES, wxID_NO, - wxID_YESTOALL, wxID_NOTOALL, - - wxID_ABORT, wxID_RETRY, wxID_IGNORE, - - wxID_RESET, - wxID_ANY, - }; - - for (wxWindowID retval : retvals) - { - if( (validTypes.Allows(retval)) && (src == ResultToString(retval, validTypes)) ) - return retval; - } - - return wxID_NONE; -} - -static bool pxTrySetFocus( wxWindow& parent, wxWindowID id ) -{ - if( wxWindow* found = parent.FindWindowById( id ) ) - { - found->SetFocus(); - return true; - } - - return false; -} - -static bool pxTrySetFocus( wxWindow* parent, wxWindowID id ) -{ - if( parent == NULL ) return false; - return pxTrySetFocus( *parent, id ); -} - -void MsgButtons::SetBestFocus( wxWindow& dialog ) const -{ - if( HasOK() && pxTrySetFocus( dialog, wxID_OK ) ) return; - if( HasNo() && pxTrySetFocus( dialog, wxID_NO ) ) return; - if( HasClose() && pxTrySetFocus( dialog, wxID_CLOSE ) ) return; - if( HasRetry() && pxTrySetFocus( dialog, wxID_RETRY ) ) return; - - // Other confirmational types of buttons must be explicitly focused by the user or - // by an implementing dialog. We won't do it here implicitly because accidental - // "on focus" typed keys could invoke really unwanted actions. - - // (typically close/ok/retry/etc. aren't so bad that accidental clicking does terrible things) -} - -void MsgButtons::SetBestFocus( wxWindow* dialog ) const -{ - if( dialog == NULL ) return; - SetBestFocus( *dialog ); -} - - -wxWindowID pxIssueConfirmation( wxDialogWithHelpers& confirmDlg, const MsgButtons& buttons ) -{ - if( confirmDlg.GetMinWidth() <= 0 ) confirmDlg.SetMinWidth( 400 * MSW_GetDPIScale()); - - confirmDlg += new ModalButtonPanel( &confirmDlg, buttons ) | pxCenter.Border( wxTOP, 8 ); - buttons.SetBestFocus( confirmDlg ); - confirmDlg.SetSizerAndFit(confirmDlg.GetSizer()); - return confirmDlg.ShowModal(); -} - - -wxWindowID pxIssueConfirmation( wxDialogWithHelpers& confirmDlg, const MsgButtons& buttons, const wxString& disablerKey ) -{ - wxConfigBase* cfg = GetAppConfig(); - - if( cfg != NULL ) - { - cfg->SetPath( L"/PopupDisablers" ); - bool recdef = cfg->IsRecordingDefaults(); - cfg->SetRecordDefaults( false ); - - wxString result = cfg->Read( disablerKey, L"enabled" ); - - cfg->SetRecordDefaults( recdef ); - cfg->SetPath( L"/" ); - - result.MakeLower(); - wxArrayString split; - SplitString( split, result, L"," ); - - // if only one param (no comma!?) then assume the entry is invalid and force a - // re-display of the dialog. - - if( split.Count() > 1 ) - { - result = split[0]; - if( result == L"disabled" || result == L"off" || result == L"no" ) - { - int result = ParseThatResult( split[1], buttons ); - if( result != wxID_ANY ) return result; - } - } - } - - pxCheckBox* DisablerCtrl = NULL; - if( cfg != NULL ) - { - // Add an option that allows the user to disable this popup from showing again. - // (and if the config hasn't been initialized yet, then assume the dialog as non-disablable) - - DisablerCtrl = new pxCheckBox(&confirmDlg, _("Do not show this dialog again.")); - - confirmDlg += 8; - confirmDlg += DisablerCtrl | wxSF.Centre(); - - if( buttons != MsgButtons().OK() ) - pxSetToolTip(DisablerCtrl, _("Disables this popup and whatever response you select here will be automatically used from now on.")); - else - pxSetToolTip(DisablerCtrl, _("The popup will not be shown again. This setting can be undone from the settings panels.")); - - } - - int modalResult = pxIssueConfirmation( confirmDlg, buttons ); - - if( modalResult != wxID_CANCEL && cfg != NULL ) - { - wxString cfgResult = ResultToString( modalResult, buttons ); - if( DisablerCtrl->IsChecked() && !cfgResult.IsEmpty() ) - { - cfg->SetPath( L"/PopupDisablers" ); - cfg->Write( disablerKey, L"disabled," + cfgResult ); - cfg->SetPath( L"/" ); - cfg->Flush(); - } - } - return modalResult; -} - -ModalButtonPanel::ModalButtonPanel( wxWindow* parent, const MsgButtons& buttons ) - : wxPanelWithHelpers( parent, wxHORIZONTAL ) -{ - // Populate the Button Sizer. - // We prefer this over the built-in wxWidgets ButtonSizer stuff used for other types of - // dialogs because we offer more button types, and we don't want the MSW default behavior - // of right-justified buttons. - - if( buttons.HasCustom() ) - AddCustomButton( pxID_CUSTOM, buttons.GetCustomLabel() ); - - // Order of wxID_RESET and custom button have been picked fairly arbitrarily, since there's - // no standard governing those. - -#ifdef __WXGTK__ - // GTK+ / Linux inverts OK/CANCEL order -- cancel / no first, OK / Yes later. >_< - if( buttons.HasCancel() ) - AddActionButton( wxID_CANCEL ); - - if( buttons.HasNo() ) - { - AddActionButton( wxID_NO ); - if( buttons.AllowsToAll() ) AddActionButton( wxID_NOTOALL ); - } - - if( buttons.HasIgnore() ) - AddCustomButton( wxID_IGNORE, _("Ignore") ); - - if( buttons.HasOK() || buttons.HasYes() ) // Extra space between Affirm and Cancel Actions - GetSizer()->Add(0, 0, 1, wxEXPAND, 0); -#endif - - if( buttons.HasOK() ) - AddActionButton( wxID_OK ); - - if( buttons.HasYes() ) - { - AddActionButton( wxID_YES ); - if( buttons.AllowsToAll() ) - AddActionButton( wxID_YESTOALL ); - } - -#ifdef __WXGTK__ - if( buttons.HasRetry() ) - AddCustomButton( wxID_RETRY, _("Retry") ); - - if( buttons.HasAbort() ) - AddCustomButton( wxID_ABORT, _("Abort") ); -#else - if( buttons.HasAbort() ) - AddCustomButton( wxID_ABORT, _("Abort") ); - - if( buttons.HasRetry() ) - AddCustomButton( wxID_RETRY, _("Retry") ); -#endif - - if( buttons.HasReset() ) - AddCustomButton( wxID_RESET, _("Reset") ); - - if( buttons.HasClose() ) - AddActionButton( wxID_CLOSE ); - -#ifndef __WXGTK__ - if( buttons.HasNo() ) - { - AddActionButton( wxID_NO ); - if( buttons.AllowsToAll() ) - AddActionButton( wxID_NOTOALL ); - } - - if( buttons.HasIgnore() ) - AddCustomButton( wxID_IGNORE, _("Ignore") ); - - if( buttons.HasCancel() ) - AddActionButton( wxID_CANCEL ); -#endif -} - -void ModalButtonPanel::OnActionButtonClicked( wxCommandEvent& evt ) -{ - wxWindow* toplevel = wxGetTopLevelParent( this ); - if( wxDialog* dialog = wxDynamicCast( toplevel, wxDialog ) ) - dialog->EndModal( evt.GetId() ); - // If the dialog doesn't close, and you're using it for a modeless dialog - hint: - // read the name of the class. ;) -} - -void ModalButtonPanel::AddCustomButton( wxWindowID id, const wxString& label ) -{ - *this += new wxButton( this, id, label ) | pxBorder().Proportion(6); - Bind(wxEVT_BUTTON, &ModalButtonPanel::OnActionButtonClicked, this, id); -} - -// This is for buttons that are defined internally by wxWidgets, such as wxID_CANCEL, wxID_ABORT, etc. -// wxWidgets will assign the labels and stuff for us. :D -void ModalButtonPanel::AddActionButton( wxWindowID id ) -{ - *this += new wxButton( this, id ) | pxBorder().Proportion(6); - Bind(wxEVT_BUTTON, &ModalButtonPanel::OnActionButtonClicked, this, id); -} diff --git a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp deleted file mode 100644 index 22399a8768..0000000000 --- a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp +++ /dev/null @@ -1,242 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2015 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ConfigurationDialog.h" -#include "System.h" - -#include "gui/MSWstuff.h" - -#include "MemoryCardFile.h" -#include "MemoryCardFolder.h" -#include - -enum MemoryCardConversionType { - MemoryCardConversion_File_8MB, - MemoryCardConversion_File_16MB, - MemoryCardConversion_File_32MB, - MemoryCardConversion_File_64MB, - MemoryCardConversion_Folder, - MemoryCardConversion_MaxCount -}; - -Dialogs::ConvertMemoryCardDialog::ConvertMemoryCardDialog( wxWindow* parent, const wxDirName& mcdPath, MemoryCardType type, const wxString& sourceFilename ) - : wxDialogWithHelpers( parent, _( "Convert a memory card to a different format" ) ) - , m_mcdPath( mcdPath ) - , m_mcdSourceFilename( sourceFilename ) -{ - SetMinWidth( 472 * MSW_GetDPIScale()); - - CreateControls( type ); - - if ( m_radio_CardType ) m_radio_CardType->Realize(); - - wxBoxSizer& s_buttons( *new wxBoxSizer( wxHORIZONTAL ) ); - s_buttons += new wxButton( this, wxID_OK, _( "Convert" ) ) | pxProportion( 2 ); - s_buttons += pxStretchSpacer( 3 ); - s_buttons += new wxButton( this, wxID_CANCEL ) | pxProportion( 2 ); - - wxBoxSizer& s_padding( *new wxBoxSizer( wxVERTICAL ) ); - - s_padding += Heading( wxString( _( "Convert: " ) ) + ( mcdPath + m_mcdSourceFilename ).GetFullPath() ).Unwrapped() | pxSizerFlags::StdExpand(); - - wxBoxSizer& s_filename( *new wxBoxSizer( wxHORIZONTAL ) ); - s_filename += Heading( _( "To: " ) ).Unwrapped().Align(wxALIGN_RIGHT) | pxProportion(1); - m_text_filenameInput->SetValue( wxFileName( m_mcdSourceFilename ).GetName() + L"_converted" ); - s_filename += m_text_filenameInput | pxProportion(2); - s_filename += Heading( L".ps2" ).Align(wxALIGN_LEFT) | pxProportion(1); - - s_padding += s_filename | pxSizerFlags::StdExpand(); - - s_padding += m_radio_CardType | pxSizerFlags::StdExpand(); - - if ( type != MemoryCardType::File ) { - s_padding += Heading( pxE( L"Please note that the resulting file may not actually contain all saves, depending on how many are in the source memory card." ) ); - } - s_padding += Heading( pxE( L"WARNING: Converting a memory card may take a while! Please do not close the emulator during the conversion process, even if the emulator is no longer responding to input." ) ); - - s_padding += 12; - s_padding += s_buttons | pxSizerFlags::StdCenter(); - - *this += s_padding | pxSizerFlags::StdExpand(); - - Bind(wxEVT_BUTTON, &ConvertMemoryCardDialog::OnOk_Click, this, wxID_OK); - Bind(wxEVT_TEXT_ENTER, &ConvertMemoryCardDialog::OnOk_Click, this, m_text_filenameInput->GetId()); - - SetSizerAndFit(GetSizer()); - - m_text_filenameInput->SetFocus(); - m_text_filenameInput->SelectAll(); -} - -void Dialogs::ConvertMemoryCardDialog::CreateControls( const MemoryCardType sourceType ) { - m_text_filenameInput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); - - RadioPanelItem toFile8MB = RadioPanelItem( _( "8 MB File (most compatible)" ), pxE( L"Convert this memory card to a standard 8 MB Memory Card .ps2 file." ) ) - .SetInt( MemoryCardConversionType::MemoryCardConversion_File_8MB ); - RadioPanelItem toFile16MB = RadioPanelItem( _( "16 MB File" ), pxE( L"Convert this memory card to a 16 MB Memory Card .ps2 file." ) ) - .SetInt( MemoryCardConversionType::MemoryCardConversion_File_16MB ); - RadioPanelItem toFile32MB = RadioPanelItem( _( "32 MB File" ), pxE( L"Convert this memory card to a 32 MB Memory Card .ps2 file." ) ) - .SetInt( MemoryCardConversionType::MemoryCardConversion_File_32MB ); - RadioPanelItem toFile64MB = RadioPanelItem( _( "64 MB File" ), pxE( L"Convert this memory card to a 64 MB Memory Card .ps2 file." ) ) - .SetInt( MemoryCardConversionType::MemoryCardConversion_File_64MB ); - RadioPanelItem toFolder = RadioPanelItem( _( "Folder" ), _( - "Convert this memory card to a folder of individual saves. " - "Unlimited capacity for saving and is not compatible with other PS2 emulators. " - "Allows direct access to the saves which makes it easy to view and back-up per game." ) ) - .SetInt( MemoryCardConversionType::MemoryCardConversion_Folder ); - - const RadioPanelItem tblForFile[] = { toFolder }; - const RadioPanelItem tblForFolder[] = { toFile8MB, toFile16MB, toFile32MB, toFile64MB }; - - switch ( sourceType ) { - case MemoryCardType::File: - m_radio_CardType = new pxRadioPanel( this, tblForFile ); - break; - case MemoryCardType::Folder: - m_radio_CardType = new pxRadioPanel( this, tblForFolder ); - break; - default: - Console.Error( "Memory Card Conversion: Invalid source type!" ); - return; - } - - m_radio_CardType->SetDefaultItem( 0 ); -} - -void Dialogs::ConvertMemoryCardDialog::OnOk_Click( wxCommandEvent& evt ) { - wxString composedName = m_text_filenameInput->GetValue().Trim() + L".ps2"; - - wxString errMsg; - if ( !isValidNewFilename( composedName, m_mcdPath, errMsg, 5 ) ) { - wxString message; - message.Printf( _( "Error (%s)" ), errMsg.c_str() ); - Msgbox::Alert( message, _( "Convert memory card" ) ); - m_text_filenameInput->SetFocus(); - m_text_filenameInput->SelectAll(); - return; - } - - bool success = false; - - wxFileName sourcePath = ( m_mcdPath + m_mcdSourceFilename ); - wxFileName targetPath = ( m_mcdPath + composedName ); - if ( m_radio_CardType ) { - MemoryCardConversionType targetType = (MemoryCardConversionType)m_radio_CardType->SelectedItem().SomeInt; - - switch ( targetType ) { - case MemoryCardConversionType::MemoryCardConversion_File_8MB: - success = ConvertToFile( sourcePath, targetPath, 8 ); - break; - case MemoryCardConversionType::MemoryCardConversion_File_16MB: - success = ConvertToFile( sourcePath, targetPath, 16 ); - break; - case MemoryCardConversionType::MemoryCardConversion_File_32MB: - success = ConvertToFile( sourcePath, targetPath, 32 ); - break; - case MemoryCardConversionType::MemoryCardConversion_File_64MB: - success = ConvertToFile( sourcePath, targetPath, 64 ); - break; - case MemoryCardConversionType::MemoryCardConversion_Folder: - success = ConvertToFolder( sourcePath, targetPath ); - break; - default: - Msgbox::Alert( _( "This target type is not supported!" ), _( "Convert memory card" ) ); - return; - } - } - - if ( !success ) { - Msgbox::Alert( _( "Memory Card conversion failed for unknown reasons." ), _( "Convert memory card" ) ); - return; - } - - EndModal( wxID_OK ); -} - -bool Dialogs::ConvertMemoryCardDialog::ConvertToFile( const wxFileName& sourcePath, const wxFileName& targetPath, const u32 sizeInMB ) { - // Conversion method: Open FolderMcd as usual, then read the raw data from it and write it to a file stream - - wxFFile targetFile( targetPath.GetFullPath(), L"wb" ); - if ( !targetFile.IsOpened() ) { - return false; - } - - FolderMemoryCard sourceFolderMemoryCard; - Pcsx2Config::McdOptions config; - config.Enabled = true; - config.Type = MemoryCardType::Folder; - sourceFolderMemoryCard.Open( StringUtil::wxStringToUTF8String(sourcePath.GetFullPath()), config, ( sizeInMB * 1024 * 1024 ) / FolderMemoryCard::ClusterSize, false, "" ); - - u8 buffer[FolderMemoryCard::PageSizeRaw]; - u32 adr = 0; - while ( adr < sourceFolderMemoryCard.GetSizeInClusters() * FolderMemoryCard::ClusterSizeRaw ) { - sourceFolderMemoryCard.Read( buffer, adr, FolderMemoryCard::PageSizeRaw ); - targetFile.Write( buffer, FolderMemoryCard::PageSizeRaw ); - adr += FolderMemoryCard::PageSizeRaw; - } - - targetFile.Close(); - sourceFolderMemoryCard.Close( false ); - - return true; -} - -bool Dialogs::ConvertMemoryCardDialog::ConvertToFolder( const wxFileName& sourcePath, const wxFileName& targetPath ) { - // Conversion method: Read all pages of the FileMcd into a FolderMcd, then just write that out with the regular methods - - wxFFile sourceFile( sourcePath.GetFullPath(), L"rb" ); - if ( !sourceFile.IsOpened() ) { - return false; - } - - u8 buffer[FolderMemoryCard::PageSizeRaw]; - FolderMemoryCard targetFolderMemoryCard; - Pcsx2Config::McdOptions config; - config.Enabled = true; - config.Type = MemoryCardType::Folder; - u32 adr = 0; - - for ( int i = 0; i < 2; ++i ) { - // Before writing the data, we first simulate the entire process without actual writes to the file system. - // This ensures that if we crash/fail due to a corrupted memory card file system or similar, we do so during - // the simulation run, and don't actually write out any partial data to the host file system. - bool simulateWrites = i == 0; - targetFolderMemoryCard.Open(StringUtil::wxStringToUTF8String(targetPath.GetFullPath()), config, 0, false, "", simulateWrites ); - - adr = 0; - sourceFile.Seek( 0 ); - while ( !sourceFile.Eof() ) { - int size = sourceFile.Read( buffer, FolderMemoryCard::PageSizeRaw ); - if ( size > 0 ) { - targetFolderMemoryCard.Save( buffer, adr, size ); - adr += size; - } - } - - targetFolderMemoryCard.Close(); - } - - sourceFile.Close(); - - if ( adr != FolderMemoryCard::TotalSizeRaw ) { - // reset memory card metrics in superblock to the default 8MB, since the converted card was different - targetFolderMemoryCard.Open(StringUtil::wxStringToUTF8String(targetPath.GetFullPath()), config, 0, true, "" ); - targetFolderMemoryCard.SetSizeInMB( 8 ); - targetFolderMemoryCard.Close(); - } - - return true; -} diff --git a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp deleted file mode 100644 index 42a161c05e..0000000000 --- a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp +++ /dev/null @@ -1,264 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2018 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ConfigurationDialog.h" -#include "System.h" -#include "gui/MSWstuff.h" - -#include "MemoryCardFile.h" -//#include -#include - -using namespace pxSizerFlags; - -extern wxString GetMsg_McdNtfsCompress(); -/* -wxFilePickerCtrl* CreateMemoryCardFilePicker( wxWindow* parent, uint portidx, uint slotidx, const wxString& filename=wxEmptyString ) -{ - return new wxFilePickerCtrl( parent, wxID_ANY, filename, - wxsFormat(_("Select memory card for Port %u / Slot %u"), portidx+1, slotidx+1), // picker window title - L"*.ps2", // default wildcard - wxDefaultPosition, wxDefaultSize, - wxFLP_DEFAULT_STYLE & ~wxFLP_FILE_MUST_EXIST - ); - -} -*/ -Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, const wxDirName& mcdpath, const wxString& suggested_mcdfileName) - : wxDialogWithHelpers( parent, _("Create a new memory card") ) - , m_mcdpath( mcdpath ) - , m_mcdfile( suggested_mcdfileName )//suggested_and_result_mcdfileName.IsEmpty() ? g_Conf->Mcd[slot].Filename.GetFullName() -{ - SetMinWidth( 472 * MSW_GetDPIScale()); - //m_filepicker = NULL; - - CreateControls(); - - //m_filepicker = CreateMemoryCardFilePicker( this, m_port, m_slot, filepath ); - - // ---------------------------- - // Sizers and Layout - // ---------------------------- - - - wxBoxSizer& s_buttons( *new wxBoxSizer(wxHORIZONTAL) ); - s_buttons += new wxButton( this, wxID_OK, _("Create") ) | pxProportion(2); - s_buttons += pxStretchSpacer(3); - s_buttons += new wxButton( this, wxID_CANCEL ) | pxProportion(2); - if (m_radio_CardType) - m_radio_CardType->Realize(); - - wxBoxSizer& s_padding( *new wxBoxSizer(wxVERTICAL) ); - - //s_padding += Heading(_("Select the size for your new memory card.")); - -// if( m_filepicker ) -// s_padding += m_filepicker | StdExpand(); -// else - { - s_padding += Heading( _( "New memory card:" ) ) | StdExpand(); - s_padding += Heading( wxString(_("At folder: ")) + (m_mcdpath + m_mcdfile).GetPath() ).Unwrapped() | StdExpand(); - - wxBoxSizer& s_filename( *new wxBoxSizer(wxHORIZONTAL) ); - s_filename += Heading( _("Select file name: ")).Unwrapped().Align(wxALIGN_RIGHT) | pxProportion(1); - m_text_filenameInput->SetValue ((m_mcdpath + m_mcdfile).GetName()); - s_filename += m_text_filenameInput | pxProportion(2); - s_filename += m_mcd_Extension | pxProportion(1); - s_padding += s_filename | StdExpand(); - } - - s_padding += m_radio_CardType | StdExpand(); -#ifdef __WXMSW__ - if (m_check_CompressNTFS) - s_padding += m_check_CompressNTFS | StdExpand(); -#endif - - - s_padding += s_buttons | StdCenter(); - - *this += s_padding | StdExpand(); - - Bind(wxEVT_BUTTON, &CreateMemoryCardDialog::OnOk_Click, this, wxID_OK); - Bind(wxEVT_TEXT_ENTER, &CreateMemoryCardDialog::OnOk_Click, this, m_text_filenameInput->GetId()); - Bind(wxEVT_RADIOBUTTON, &CreateMemoryCardDialog::OnRadioChanged, this); - - // ...Typical solution to everything? Or are we doing something weird? - SetSizerAndFit(GetSizer()); - - m_text_filenameInput->SetFocus(); - m_text_filenameInput->SelectAll(); -} - -bool Dialogs::CreateMemoryCardDialog::CreateIt( const wxString& mcdFile, uint sizeInMB, bool isPSX ) -{ - //int enc[16] = {0x77,0x7f,0x7f,0x77,0x7f,0x7f,0x77,0x7f,0x7f,0x77,0x7f,0x7f,0,0,0,0}; - - // PS2 Memory Card - u8 m_effeffs[528 * 16]; - memset8<0xff>(m_effeffs); - - // PSX Memory Card; 8192 is the size in bytes of a single block of a PSX memory card (8 KiB). - u8 m_effeffs_psx[8192]; - memset8<0xff>(m_effeffs_psx); - - // Since isPSX will have a default false state, it makes more sense to check "not PSX" first - if (!isPSX) { - Console.WriteLn("(FileMcd) Creating new PS2 %uMB memory card: '%ls'", sizeInMB, WX_STR(mcdFile)); - } - else { - Console.WriteLn("(FileMcd) Creating new PSX 128 KiB memory card: '%ls'", WX_STR(mcdFile)); - } - - wxFFile fp( mcdFile, L"wb" ); - if( !fp.IsOpened() ) return false; - - static const int MC2_MBSIZE = 1024 * 528 * 2; // Size of a single megabyte of card data - - if (!isPSX) { - for (uint i = 0; i<(MC2_MBSIZE*sizeInMB) / sizeof(m_effeffs); i++) { - if (fp.Write(m_effeffs, sizeof(m_effeffs)) == 0) { - return false; - } - } - } else { - // PSX cards consist of 16 blocks, each 8 KiB in size. - for (uint i = 0; i < 16; i++) { - if (fp.Write(m_effeffs_psx, sizeof(m_effeffs_psx)) == 0) { - return false; - } - } - } - - return true; -} - -void Dialogs::CreateMemoryCardDialog::OnRadioChanged(wxCommandEvent& evt) -{ - evt.Skip(); - - m_mcd_Extension->SetLabel(m_radio_CardType->SelectedItem().SomeInt == 1 ? L".mcr" : L".ps2"); -} - -void Dialogs::CreateMemoryCardDialog::OnOk_Click( wxCommandEvent& evt ) -{ - // Save status of the NTFS compress checkbox for future reference. - // [TODO] Remove g_Conf->McdCompressNTFS, and have this dialog load/save directly from the ini. - -#ifdef __WXMSW__ - g_Conf->EmuOptions.McdCompressNTFS = m_check_CompressNTFS->GetValue(); -#endif - result_createdMcdFilename=L"_INVALID_FILE_NAME_"; - - wxString composedName = m_text_filenameInput->GetValue().Trim() + (m_radio_CardType->SelectedItem().SomeInt == 1 ? L".mcr" : L".ps2"); - - wxString errMsg; - if( !isValidNewFilename(composedName, m_mcdpath, errMsg, 5) ) - { - wxString message; - message.Printf(_("Error (%s)"), errMsg.c_str()); - Msgbox::Alert( message, _("Create memory card") ); - m_text_filenameInput->SetFocus(); - m_text_filenameInput->SelectAll(); - return; - } - - wxString fullPath = ( m_mcdpath + composedName ).GetFullPath(); - if (m_radio_CardType && m_radio_CardType->SelectedItem().SomeInt == 0) { - // user selected to create a folder memory card - if ( !wxFileName::Mkdir( fullPath ) ) { - Msgbox::Alert( - _( "Error: The directory for the memory card could not be created." ), - _( "Create memory card" ) - ); - } else { - // also create an empty superblock so we can recognize memory card folders based on if they have a superblock - wxFFile superblock( wxFileName( fullPath, L"_pcsx2_superblock" ).GetFullPath(), L"wb" ); - superblock.Close(); - } - } else { - // otherwise create a file - if (!CreateIt( - fullPath, - m_radio_CardType ? m_radio_CardType->SelectedItem().SomeInt : 8, - m_radio_CardType->SelectedItem().SomeInt == 1)) { - Msgbox::Alert( - _( "Error: The memory card could not be created." ), - _( "Create memory card" ) - ); - return; - } - } - - result_createdMcdFilename = composedName; - EndModal( wxID_OK ); -} - -void Dialogs::CreateMemoryCardDialog::CreateControls() -{ -#ifdef __WXMSW__ - m_check_CompressNTFS = new pxCheckBox( this, - _("Use NTFS compression when creating this card."), - GetMsg_McdNtfsCompress() - ); - - m_check_CompressNTFS->SetToolTip( pxEt( L"NTFS compression can be changed manually at any time by using file properties from Windows Explorer." - ) - ); - - // Initial value of the checkbox is saved between calls to the dialog box. If the user checks - // the option, it remains checked for future dialog. If the user unchecks it, ditto. - m_check_CompressNTFS->SetValue( g_Conf->EmuOptions.McdCompressNTFS ); -#endif - - m_text_filenameInput = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - m_mcd_Extension = new wxStaticText(this, wxID_ANY, L".ps2"); - - const RadioPanelItem tbl_CardTypes[] = - { - RadioPanelItem(_("8 MB [most compatible]"), _("This is the standard Sony-provisioned size, and is supported by all games and BIOS versions.")) - . SetToolTip(_t("Always use this option if you want the safest and surest memory card behavior.")) - . SetInt(8), - - RadioPanelItem(_("16 MB"), _("A typical size for 3rd-party memory cards which should work with most games.")) - . SetToolTip(_t("16 and 32 MB cards have roughly the same compatibility factor.")) - . SetInt(16), - - RadioPanelItem(_("32 MB"), _("A typical size for 3rd-party memory cards which should work with most games.")) - . SetToolTip(_t("16 and 32 MB cards have roughly the same compatibility factor.")) - . SetInt(32), - - RadioPanelItem(_("64 MB"), _("Low compatibility warning: Yes it's very big, but may not work with many games.")) - . SetToolTip(_t("Use at your own risk. Erratic memory card behavior is possible (though unlikely).")) - . SetInt(64), - - RadioPanelItem(_("Folder [Recommended]"), _("Store memory card contents in the host filesystem instead of a file.")) - . SetToolTip(_t("Dynamically allocate and store memory card contents in a folder.\n" - "Only exposes the save files for the running game, rather than the whole memory card.\n" - "You can see the structure and the saves with your File Explorer.\n" - "Can be used to back-up individual saves instead of all saves on a memcard.\n" - "Incompatible with PS2 memory card editing tools or savegame managers (such as MyMC, MyMCPlus).\n" - "You can always convert back between folder type and single memcard file.\n")) - . SetInt(0), - - RadioPanelItem(_("128 KiB (PS1)"), _("This is the standard Sony-provisioned size PS1 memory card, only compatible with PS1 games.")) - . SetToolTip(_t("This memory card is required by PS1 games. It is not compatible with PS2 games.")) - . SetInt(1) - }; - - m_radio_CardType = new pxRadioPanel(this, tbl_CardTypes); - m_radio_CardType->SetDefaultItem(0); -} - diff --git a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp deleted file mode 100644 index 7c960f522d..0000000000 --- a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp +++ /dev/null @@ -1,223 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "System.h" -#include "gui/MSWstuff.h" - -#include "ModalPopups.h" -#include "gui/Panels/ConfigurationPanels.h" -#include -#include -#include - -using namespace Panels; -using namespace pxSizerFlags; - -wxIMPLEMENT_DYNAMIC_CLASS(ApplicableWizardPage, wxWizardPageSimple); - -ApplicableWizardPage::ApplicableWizardPage( wxWizard* parent, wxWizardPage* prev, wxWizardPage* next, const wxBitmap& bitmap ) - : wxWizardPageSimple( parent, prev, next, bitmap ) -{ -} - -// This is a hack feature substitute for prioritized apply events. This callback is issued prior -// to the apply chain being run, allowing a panel to do some pre-apply prepwork. PAnels implementing -// this function should not modify the g_conf state. -bool ApplicableWizardPage::PrepForApply() -{ - return true; -} - - -// ---------------------------------------------------------------------------- -Panels::SettingsDirPickerPanel::SettingsDirPickerPanel( wxWindow* parent ) - : DirPickerPanel( parent, FolderId_Settings, _("Settings"), AddAppName(_("Select a folder for %s settings")) ) -{ - pxSetToolTip( this, pxEt( L"This is the folder where PCSX2 saves your settings." - ) ); - - SetStaticDesc( pxE( L"You may optionally specify a location for your PCSX2 settings here. If the location contains existing PCSX2 settings, you will be given the option to import or overwrite them." - ) ); -} - -namespace Panels -{ - - class FirstTimeIntroPanel : public wxPanelWithHelpers - { - public: - FirstTimeIntroPanel( wxWindow* parent ); - virtual ~FirstTimeIntroPanel() = default; - }; -} - -Panels::FirstTimeIntroPanel::FirstTimeIntroPanel( wxWindow* parent ) - : wxPanelWithHelpers( parent, wxVERTICAL ) -{ - SetMinWidth( MSW_GetDPIScale() * 600 ); - - FastFormatUnicode faqFile; - // configFile.Write(L"file:///%s/Configuration_Guide.pdf", WX_STR(PathDefs::GetDocs().ToString())); - faqFile.Write(L"file:///%s/PCSX2_FAQ.pdf", WX_STR(PathDefs::GetDocs().ToString())); - - wxStaticBoxSizer& langSel = *new wxStaticBoxSizer( wxVERTICAL, this, _("Language selector") ); - - langSel += new Panels::LanguageSelectionPanel( this ) | StdCenter(); - langSel += Heading(_("Change the language only if you need to.\nThe system default should be fine for most operating systems.")); - langSel += 8; - - *this += langSel | StdExpand(); - *this += GetCharHeight() * 2; - - *this += Heading(_("Welcome to PCSX2!")).Bold() | StdExpand(); - *this += GetCharHeight(); - - *this += Heading(AddAppName( - pxE( L"This wizard will help guide you through configuring your BIOS. It is recommended if this is your first time installing %s that you view the readme and configuration guide." - ) ) - ); - - *this += GetCharHeight() * 2; - /* - *this += new wxHyperlinkCtrl( this, wxID_ANY, - _("Configuration Guide"), configFile.c_str() - ) | pxCenter.Border( wxALL, 5 ); - */ - *this += new wxHyperlinkCtrl( this, wxID_ANY, - _("Readme / FAQ"), faqFile.c_str() - ) | pxCenter.Border( wxALL, 5 ); - -} - -// -------------------------------------------------------------------------------------- -// FirstTimeWizard (implementations) -// -------------------------------------------------------------------------------------- -FirstTimeWizard::FirstTimeWizard( wxWindow* parent ) - : wxWizard( parent, wxID_ANY, AddAppName(_("%s First Time Configuration")) ) - , m_page_intro ( *new ApplicableWizardPage( this ) ) - , m_page_bios ( *new ApplicableWizardPage( this, &m_page_intro ) ) - - , m_panel_Intro ( *new FirstTimeIntroPanel( &m_page_intro )) - , m_panel_BiosSel ( *new BiosSelectorPanel( &m_page_bios ) ) -{ - // Page 3 - Bios Panel - - m_page_intro. SetSizer( new wxBoxSizer( wxVERTICAL ) ); - m_page_bios. SetSizer( new wxBoxSizer( wxVERTICAL ) ); - - m_page_intro += m_panel_Intro | StdExpand(); - m_page_bios += m_panel_BiosSel | StdExpand(); - - // Temporary tutorial message for the BIOS, needs proof-reading!! - m_page_bios += 12; - m_page_bios += new pxStaticHeading( &m_page_bios, - pxE( L"PCSX2 requires a *legal* copy of the PS2 BIOS in order to run games.\nYou cannot use a copy obtained from a friend or the Internet.\nYou must dump the BIOS from your *own* PlayStation 2 console." - ) - ) | StdExpand(); - - // Assign page indexes as client data - m_page_intro .SetClientData( (void*)0 ); - m_page_bios .SetClientData( (void*)1 ); - - // Build the forward chain: - // (backward chain is built during initialization above) - m_page_intro .SetNext( &m_page_bios ); - - GetPageAreaSizer() += m_page_intro; - - // this doesn't descent from wxDialogWithHelpers, so we need to explicitly - // fit and center it. :( - - Bind(wxEVT_WIZARD_PAGE_CHANGED, &FirstTimeWizard::OnPageChanged, this); - Bind(wxEVT_WIZARD_PAGE_CHANGING, &FirstTimeWizard::OnPageChanging, this); - Bind(wxEVT_LISTBOX_DCLICK, &FirstTimeWizard::OnDoubleClicked, this); - - Bind(wxEVT_BUTTON, &FirstTimeWizard::OnRestartWizard, this, pxID_RestartWizard); -} - -void FirstTimeWizard::OnRestartWizard( wxCommandEvent& evt ) -{ - EndModal( pxID_RestartWizard ); - evt.Skip(); -} - -static void _OpenConsole() -{ - g_Conf->ProgLogBox.Visible = true; - wxGetApp().OpenProgramLog(); -} - -int FirstTimeWizard::ShowModal() -{ - if( IsDebugBuild ) wxGetApp().PostIdleMethod( _OpenConsole ); - return _parent::ShowModal(); -} - -void FirstTimeWizard::OnDoubleClicked( wxCommandEvent& evt ) -{ - wxWindow* forwardButton = FindWindow( wxID_FORWARD ); - if( forwardButton == NULL ) return; - - wxCommandEvent nextpg( wxEVT_BUTTON, wxID_FORWARD ); - nextpg.SetEventObject( forwardButton ); - forwardButton->GetEventHandler()->ProcessEvent( nextpg ); -} - -void FirstTimeWizard::OnPageChanging( wxWizardEvent& evt ) -{ - if( evt.GetPage() == NULL ) return; // safety valve! - - sptr page = (sptr)evt.GetPage()->GetClientData(); - - if( evt.GetDirection() ) - { - // Moving forward: - // Apply settings from the current page... - - if( page >= 0 ) - { - if( ApplicableWizardPage* page = wxDynamicCast( GetCurrentPage(), ApplicableWizardPage ) ) - { - if( !page->PrepForApply() || !page->GetApplyState().ApplyAll() ) - { - evt.Veto(); - return; - } - } - } - - if( page == 0 ) - { - if( wxFile::Exists(GetUiSettingsFilename()) || wxFile::Exists(GetVmSettingsFilename()) ) - { - // Asks the user if they want to import or overwrite the existing settings. - - Dialogs::ImportSettingsDialog modal( this ); - if( modal.ShowModal() != wxID_OK ) - { - evt.Veto(); - return; - } - } - } - } -} - -void FirstTimeWizard::OnPageChanged( wxWizardEvent& evt ) -{ - if( ((sptr)evt.GetPage() == (sptr)&m_page_bios) ) - m_panel_BiosSel.OnShown(); -} diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp deleted file mode 100644 index f490a58028..0000000000 --- a/pcsx2/gui/Dialogs/GSDumpDialog.cpp +++ /dev/null @@ -1,983 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "gui/AppCommon.h" -#include "gui/MSWstuff.h" - -#include "gui/Dialogs/ModalPopups.h" - - -#include "gui/EmbeddedImage.h" -#include "common/FileSystem.h" -#include "common/StringUtil.h" -#include "gui/Resources/NoIcon.h" -#include "HostDisplay.h" - -#include "gui/PathDefs.h" -#include "gui/AppConfig.h" -#include "gui/GSFrame.h" -#include "Counters.h" -#include "PerformanceMetrics.h" -#include "GameDatabase.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace GSDumpTypes; - -static std::optional GetPreviewImageFromDump(const std::string& filename) -{ - std::vector pixels; - u32 width, height; - if (!GSDumpFile::GetPreviewImageFromDump(filename.c_str(), &width, &height, &pixels)) - return std::nullopt; - - // strip alpha bytes because wx is dumb and stores on a separate plane - // apparently this isn't aligned? stupidity... - const u32 pitch = width * 3; - u8* wxpixels = static_cast(std::malloc(pitch * height)); - for (u32 y = 0; y < height; y++) - { - const u8* in = reinterpret_cast(pixels.data() + y * width); - u8* out = wxpixels + y * pitch; - for (u32 x = 0; x < width; x++) - { - *(out++) = in[0]; - *(out++) = in[1]; - *(out++) = in[2]; - in += sizeof(u32); - } - } - - return wxImage(wxSize(width, height), wxpixels); -} - -namespace GSDump -{ - bool isRunning = false; -} - -wxDEFINE_EVENT(EVT_CLOSE_DUMP, wxCommandEvent); - -using namespace pxSizerFlags; - -// -------------------------------------------------------------------------------------- -// GSDumpDialog Implementation -// -------------------------------------------------------------------------------------- - -static GSRendererType s_renderer_overrides[] = { - GSRendererType::SW, -#ifdef ENABLE_OPENGL - GSRendererType::OGL, -#endif -#ifdef ENABLE_VULKAN - GSRendererType::VK, -#endif -#if defined(_WIN32) - GSRendererType::DX11, - GSRendererType::DX12, -#elif defined(__APPLE__) - GSRendererType::Metal, -#endif -}; - -Dialogs::GSDumpDialog::GSDumpDialog(wxWindow* parent) - : wxDialogWithHelpers(parent, _("GS Debugger"), pxDialogFlags().SetMinimize().SetResize()) - , m_dump_list(new wxListView(this, ID_DUMP_LIST, wxDefaultPosition, wxSize(400, 300), wxLC_NO_HEADER | wxLC_REPORT | wxLC_SINGLE_SEL)) - , m_preview_image(new wxStaticBitmap(this, wxID_ANY, wxBitmap(EmbeddedImage().Get()), wxDefaultPosition, wxSize(400,250))) - , m_debug_mode(new wxCheckBox(this, ID_DEBUG_MODE, _("Debug Mode"))) - , m_renderer_overrides(new wxRadioBox()) - , m_framerate_selector(new wxSpinCtrl(this, ID_FRAMERATE, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 999, 0)) - , m_gif_list(new wxTreeCtrl(this, ID_SEL_PACKET, wxDefaultPosition, wxSize(400, 300), wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)) - , m_gif_packet(new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(400, 300), wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)) - , m_start(new wxButton(this, ID_RUN_START, _("Go to Start"), wxDefaultPosition, wxSize(150,50))) - , m_step(new wxButton(this, ID_RUN_STEP, _("Step"), wxDefaultPosition, wxSize(150, 50))) - , m_selection(new wxButton(this, ID_RUN_CURSOR, _("Run to Selection"), wxDefaultPosition, wxSize(150, 50))) - , m_vsync(new wxButton(this, ID_RUN_VSYNC, _("Go to next VSync"), wxDefaultPosition, wxSize(150, 50))) - , m_settings(new wxButton(this, ID_SETTINGS, _("Open GS Settings"), wxDefaultPosition, wxSize(150, 50))) - , m_run(new wxButton(this, ID_RUN_DUMP, _("Run"), wxDefaultPosition, wxSize(150, 50))) - , m_thread(std::make_unique(this)) -{ - wxBoxSizer* dump_info = new wxBoxSizer(wxVERTICAL); - wxBoxSizer* dump_preview = new wxBoxSizer(wxVERTICAL); - wxFlexGridSizer* grid = new wxFlexGridSizer(3, StdPadding, StdPadding); - wxBoxSizer* dbg_tree = new wxBoxSizer(wxVERTICAL); - wxBoxSizer* dbg_actions = new wxBoxSizer(wxVERTICAL); - wxBoxSizer* gif = new wxBoxSizer(wxVERTICAL); - wxBoxSizer* dumps_list = new wxBoxSizer(wxVERTICAL); - wxBoxSizer* framerate_sel = new wxBoxSizer(wxHORIZONTAL); - framerate_sel->Add(new wxStaticText(this, wxID_ANY, _("Framerate:")), wxSizerFlags().Centre()); - framerate_sel->Add(m_framerate_selector, wxSizerFlags(1).Expand()); - - m_run->SetDefault(); - wxArrayString rdoverrides; - rdoverrides.Add("None"); - for (GSRendererType over : s_renderer_overrides) - rdoverrides.Add(Pcsx2Config::GSOptions::GetRendererName(over)); - m_renderer_overrides->Create(this, wxID_ANY, "Renderer overrides", wxDefaultPosition, wxDefaultSize, rdoverrides, 1); - - dbg_tree->Add(new wxStaticText(this, wxID_ANY, _("GIF Packets"))); - dbg_tree->Add(m_gif_list, StdExpand().Proportion(1)); - dbg_actions->Add(m_debug_mode); - dbg_actions->Add(m_start, StdExpand()); - dbg_actions->Add(m_step, StdExpand()); - dbg_actions->Add(m_selection, StdExpand()); - dbg_actions->Add(m_vsync, StdExpand()); - gif->Add(new wxStaticText(this, wxID_ANY, _("Packet Content"))); - gif->Add(m_gif_packet, StdExpand().Proportion(1)); - - dumps_list->Add(new wxStaticText(this, wxID_ANY, _("GS Dumps List")), StdExpand()); - dumps_list->Add(m_dump_list, StdExpand()); - dump_info->Add(m_renderer_overrides, StdExpand()); - dump_info->Add(framerate_sel, StdExpand()); - dump_info->Add(m_settings, StdExpand()); - dump_info->Add(m_run, StdExpand()); - dump_preview->Add(new wxStaticText(this, wxID_ANY, _("Preview")), StdExpand()); - dump_preview->Add(m_preview_image, StdCenter()); - - grid->Add(dumps_list, StdExpand()); - grid->Add(dump_info, StdExpand()); - grid->Add(dump_preview, StdExpand()); - - grid->Add(dbg_tree, StdExpand()); - grid->Add(dbg_actions, StdExpand()); - grid->Add(gif, StdExpand()); - - grid->AddGrowableCol(0); - grid->AddGrowableCol(2); - grid->AddGrowableRow(1); - - SetSizerAndFit(grid); - - // populate UI and setup state - m_debug_mode->Disable(); - m_start->Disable(); - m_step->Disable(); - m_selection->Disable(); - m_vsync->Disable(); - GetDumpsList(); - - m_fs_watcher.SetOwner(this); - m_fs_watcher.Add(wxFileName(g_Conf->Folders.Snapshots.ToAscii())); - wxEvtHandler::Connect(wxEVT_FSWATCHER, wxFileSystemWatcherEventHandler(Dialogs::GSDumpDialog::PathChanged)); - - Bind(wxEVT_LIST_ITEM_SELECTED, &Dialogs::GSDumpDialog::SelectedDump, this, ID_DUMP_LIST); - Bind(wxEVT_LIST_ITEM_ACTIVATED, &Dialogs::GSDumpDialog::RunDump, this, ID_DUMP_LIST); - Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::RunDump, this, ID_RUN_DUMP); - Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::ToStart, this, ID_RUN_START); - Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::StepPacket, this, ID_RUN_STEP); - Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::ToCursor, this, ID_RUN_CURSOR); - Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::ToVSync, this, ID_RUN_VSYNC); - Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::OpenSettings, this, ID_SETTINGS); - Bind(wxEVT_TREE_SEL_CHANGED, &Dialogs::GSDumpDialog::ParsePacket, this, ID_SEL_PACKET); - Bind(wxEVT_CHECKBOX, &Dialogs::GSDumpDialog::CheckDebug, this, ID_DEBUG_MODE); - Bind(wxEVT_SPINCTRL, &Dialogs::GSDumpDialog::UpdateFramerate, this, ID_FRAMERATE); - Bind(EVT_CLOSE_DUMP, &Dialogs::GSDumpDialog::CloseDump, this); - - UpdateFramerate(m_framerate_selector->GetValue()); -} - -void Dialogs::GSDumpDialog::GetDumpsList() -{ - m_dump_list->ClearAll(); - wxDir snaps(g_Conf->Folders.Snapshots.ToAscii()); - wxString filename; - bool cont = snaps.GetFirst(&filename); - int h = 0, j = 0; - m_dump_list->AppendColumn("Dumps"); - // set the column size to be exactly of the size of our list - m_dump_list->GetSize(&h, &j); - m_dump_list->SetColumnWidth(0, h); - std::vector dumps; - - while (cont) - { - if (filename.EndsWith(".gs")) - dumps.push_back(filename.substr(0, filename.length() - 3)); - else if (filename.EndsWith(".gs.xz")) - dumps.push_back(filename.substr(0, filename.length() - 6)); - else if (filename.EndsWith(".gs.zst")) - dumps.push_back(filename.substr(0, filename.length() - 7)); - cont = snaps.GetNext(&filename); - } - std::sort(dumps.begin(), dumps.end(), [](const wxString& a, const wxString& b) { return a.CmpNoCase(b) < 0; }); - dumps.erase(std::unique(dumps.begin(), dumps.end()), dumps.end()); // In case there was both .gs and .gs.xz - for (size_t i = 0; i < dumps.size(); i++) - m_dump_list->InsertItem(i, dumps[i]); -} - -void Dialogs::GSDumpDialog::UpdateFramerate(int val) -{ - if (val) - m_thread->m_frame_ticks = (GetTickFrequency() + (val/2)) / val; - else - m_thread->m_frame_ticks = 0; -} - -void Dialogs::GSDumpDialog::UpdateFramerate(wxCommandEvent& evt) -{ - UpdateFramerate(evt.GetInt()); -} - -void Dialogs::GSDumpDialog::SelectedDump(wxListEvent& evt) -{ - wxString filename_preview = g_Conf->Folders.Snapshots.ToAscii() + ("/" + evt.GetText()) + ".png"; - wxString filename = g_Conf->Folders.Snapshots.ToAscii() + ("/" + evt.GetText()) + ".gs"; - if (!wxFileExists(filename)) - filename.append(".xz"); - if (!wxFileExists(filename)) - filename = filename.RemoveLast(3).append(".zst"); - if (wxFileExists(filename_preview)) - { - auto img = wxImage(filename_preview); - img.Rescale(400,250, wxIMAGE_QUALITY_HIGH); - m_preview_image->SetBitmap(wxBitmap(img)); - } - else if (std::optional img = GetPreviewImageFromDump(StringUtil::wxStringToUTF8String(filename)); img.has_value()) - { - // try embedded dump - img->Rescale(400, 250, wxIMAGE_QUALITY_HIGH); - m_preview_image->SetBitmap(img.value()); - } - else - { - m_preview_image->SetBitmap(EmbeddedImage().Get()); - } - - m_selected_dump = wxString(filename); -} - -void Dialogs::GSDumpDialog::PathChanged(wxFileSystemWatcherEvent& event) -{ - int type = event.GetChangeType(); - - if (type == wxFSW_EVENT_CREATE || type == wxFSW_EVENT_DELETE || type == wxFSW_EVENT_RENAME) - GetDumpsList(); -} - -void Dialogs::GSDumpDialog::CloseDump(wxCommandEvent& event) -{ - m_debug_mode->Disable(); - m_start->Disable(); - m_step->Disable(); - m_selection->Disable(); - m_vsync->Disable(); - m_gif_list->DeleteAllItems(); - m_gif_packet->DeleteAllItems(); - m_debug_mode->SetValue(false); - m_run->Enable(); - m_settings->Enable(); -} - -// -------------------------------------------------------------------------------------- -// GSDumpDialog GUI Buttons -// -------------------------------------------------------------------------------------- - -void Dialogs::GSDumpDialog::RunDump(wxCommandEvent& event) -{ - if (!m_run->IsEnabled()) - return; - - m_thread->m_dump_file = GSDumpFile::OpenGSDump(m_selected_dump.ToUTF8()); - if (!m_thread->m_dump_file) - { - wxString s; - s.Printf(_("Failed to load the dump %s !"), m_selected_dump); - wxMessageBox(s, _("GS Debugger"), wxICON_ERROR); - return; - } - - m_run->Disable(); - m_settings->Disable(); - m_debug_mode->Enable(); - m_thread->m_renderer = m_renderer_overrides->GetSelection(); - m_thread->Start(); - return; -} - -void Dialogs::GSDumpDialog::CheckDebug(wxCommandEvent& event) -{ - if (m_debug_mode->GetValue()) - { - GenPacketList(); - m_start->Enable(); - m_step->Enable(); - m_selection->Enable(); - m_vsync->Enable(); - } - else - { - m_gif_list->DeleteAllItems(); - m_gif_packet->DeleteAllItems(); - m_gif_list->Refresh(); - m_start->Disable(); - m_step->Disable(); - m_selection->Disable(); - m_vsync->Disable(); - } - m_thread->m_debug = m_debug_mode->GetValue(); -} - -void Dialogs::GSDumpDialog::StepPacket(wxCommandEvent& event) -{ - if (m_thread->m_debug_index < m_gif_items.size() - 1) - { - m_gif_list->SelectItem(m_gif_items[m_thread->m_debug_index + 1]); - m_button_events.push_back(GSEvent{Step, 0}); - } -} - -void Dialogs::GSDumpDialog::ToCursor(wxCommandEvent& event) -{ - m_button_events.push_back(GSEvent{RunCursor, wxAtoi(m_gif_list->GetItemText(m_gif_list->GetFocusedItem()).BeforeFirst('-'))}); -} - -void Dialogs::GSDumpDialog::ToVSync(wxCommandEvent& event) -{ - if (m_thread->m_debug_index < m_gif_items.size() - 1) - { - wxTreeItemId pkt = m_gif_items[m_thread->m_debug_index]; - if (!m_gif_list->ItemHasChildren(pkt)) - pkt = m_gif_list->GetItemParent(pkt); - if (m_gif_list->GetNextSibling(pkt).IsOk()) - m_gif_list->SelectItem(m_gif_list->GetNextSibling(pkt)); - m_button_events.push_back(GSEvent{RunVSync, 0}); - } -} - -void Dialogs::GSDumpDialog::OpenSettings(wxCommandEvent& event) -{ - GSconfigure(); - - // config has to be reloaded here, otherwise it won't apply when we restart - g_Conf->EmuOptions.GS.ReloadIniSettings(); -} - -void Dialogs::GSDumpDialog::ToStart(wxCommandEvent& event) -{ - m_gif_list->SelectItem(m_gif_items[0]); - m_button_events.push_back(GSEvent{RunCursor, 0}); -} - -// -------------------------------------------------------------------------------------- -// GSDumpDialog Packet Parsing -// -------------------------------------------------------------------------------------- - -u32 Dialogs::GSDumpDialog::ReadPacketSize(const void* packet) -{ - u128 tag; - memcpy(&tag, packet, sizeof(tag)); - u32 nloop = GetBits(tag, 0, 15); - GIFFlag flg = GetBits(tag, 58, 2); - u32 nreg = GetBits(tag, 60, 4); - if (nreg == 0) - nreg = 16; - switch (flg) - { - case GIFFlag::PACKED: - return 16 + nloop * nreg * 16; - case GIFFlag::REGLIST: - return 16 + (nloop * nreg * 8 + 8) & ~15; - default: - return 16 + nloop * 16; - } -} - -void Dialogs::GSDumpDialog::GenPacketList() -{ - int i = 0; - m_gif_list->DeleteAllItems(); - m_gif_items.clear(); - wxTreeItemId mainrootId = m_gif_list->AddRoot("root"); - wxTreeItemId rootId = m_gif_list->AppendItem(mainrootId, "0 - VSync"); - for (auto& element : m_thread->m_dump_file->GetPackets()) - { - wxString s, t; - element.id == GSType::Transfer ? t.Printf(" - %s", GSDumpTypes::GetName(element.path)) : t.Printf(""); - s.Printf("%d - %s%s - %d byte", i, GSDumpTypes::GetName(element.id), t, element.length); - if (element.id == GSType::VSync) - { - m_gif_list->SetItemText(rootId, s); - rootId = m_gif_list->AppendItem(mainrootId, "VSync"); - m_gif_items.push_back(rootId); - } - else - { - wxTreeItemId tmp = m_gif_list->AppendItem(rootId, s); - m_gif_items.push_back(tmp); - } - - i++; - } - m_gif_list->Delete(rootId); - m_gif_list->SelectItem(m_gif_items[0]); -} - -void Dialogs::GSDumpDialog::GenPacketInfo(const GSDumpFile::GSData& dump) -{ - m_gif_packet->DeleteAllItems(); - wxTreeItemId rootId = m_gif_packet->AddRoot("root"); - switch (dump.id) - { - case GSType::Transfer: - { - const u8* data = dump.data; - u32 remaining = dump.length; - int idx = 0; - while (remaining >= 16) - { - wxTreeItemId trootId = m_gif_packet->AppendItem(rootId, wxString::Format("Transfer Path %s Packet %u", GSDumpTypes::GetName(dump.path), idx)); - ParseTransfer(trootId, data); - m_gif_packet->Expand(trootId); - u32 size = ReadPacketSize(data); - remaining -= size; - data += size; - idx++; - } - break; - } - case GSType::VSync: - { - wxString s; - s.Printf("Field = %u", dump.data[0]); - m_gif_packet->AppendItem(rootId, s); - break; - } - case GSType::ReadFIFO2: - { - wxString s; - s.Printf("ReadFIFO2: Size = %d byte", dump.length); - m_gif_packet->AppendItem(rootId, s); - break; - } - case GSType::Registers: - m_gif_packet->AppendItem(rootId, "Registers"); - break; - } -} - -void Dialogs::GSDumpDialog::ParseTransfer(wxTreeItemId& trootId, const u8* data) -{ - u64 tag = *(u64*)data; - u64 regs = *(u64*)(data + 8); - u32 nloop = GetBits(tag, 0, 15); - u8 eop = GetBits(tag, 15, 1); - u8 pre = GetBits(tag, 46, 1); - u32 prim = GetBits(tag, 47, 11); - GIFFlag flg = GetBits(tag, 58, 2); - u32 nreg = GetBits(tag, 60, 4); - if (nreg == 0) - nreg = 16; - - std::array infos; - m_stored_q = 1.0; - - m_gif_packet->AppendItem(trootId, wxString::Format("nloop = %u", nloop)); - m_gif_packet->AppendItem(trootId, wxString::Format("eop = %u", eop)); - m_gif_packet->AppendItem(trootId, wxString::Format("flg = %s", GSDumpTypes::GetName(flg))); - m_gif_packet->AppendItem(trootId, wxString::Format("pre = %u", pre)); - if (pre) - { - wxTreeItemId id = m_gif_packet->AppendItem(trootId, L"prim"); - ParseTreePrim(id, prim); - } - m_gif_packet->AppendItem(trootId, wxString::Format("nreg = %u", nreg)); - wxTreeItemId regId = m_gif_packet->AppendItem(trootId, L"reg"); - - int p = 16; - switch (flg) - { - case GIFFlag::PACKED: - { - for (u32 j = 0; j < nloop; j++) - { - for (u32 i = 0; i < nreg; i++) - { - u128 reg_data; - memcpy(®_data, data + p, 16); - ParseTreeReg(regId, GetBits(regs, i * 4, 4), reg_data, true); - p += 16; - } - } - break; - } - case GIFFlag::REGLIST: - { - for (u32 j = 0; j < nloop; j++) - { - for (u32 i = 0; i < nreg; i++) - { - u128 reg_data; - memcpy(®_data.lo, data + p, 8); - reg_data.hi = 0; - ParseTreeReg(regId, GetBits(regs, i * 4, 4), reg_data, false); - p += 8; - } - } - break; - } - case GIFFlag::IMAGE: - case GIFFlag::IMAGE2: - m_gif_packet->AppendItem(regId, wxString::Format("IMAGE %d bytes", nloop * 16)); - break; - } - m_gif_packet->Expand(regId); -} - -void Dialogs::GSDumpDialog::ParsePacket(wxTreeEvent& event) -{ - GenPacketInfo(m_thread->m_dump_file->GetPackets()[wxAtoi(m_gif_list->GetItemText(event.GetItem()).BeforeFirst('-'))]); -} - -void Dialogs::GSDumpDialog::ParseTreeReg(wxTreeItemId& id, GIFReg reg, u128 data, bool packed) -{ - wxTreeItemId rootId = m_gif_packet->AppendItem(id, wxString(GSDumpTypes::GetName(reg))); - switch (reg) - { - case GIFReg::PRIM: - ParseTreePrim(rootId, data.lo); - break; - case GIFReg::RGBAQ: - { - u32 r, g, b, a; - float q; - - if (packed) - { - r = GetBits(data, 0, 8); - g = GetBits(data, 32, 8); - b = GetBits(data, 64, 8); - a = GetBits(data, 96, 8); - q = m_stored_q; - } - else - { - r = GetBits(data, 0, 8); - g = GetBits(data, 8, 8); - b = GetBits(data, 16, 8); - a = GetBits(data, 24, 8); - q = BitCast(data._u32[1]); - } - - m_gif_packet->SetItemText(rootId, wxString::Format("%s - #%02x%02x%02x%02x, %g", GSDumpTypes::GetName(reg), r, g, b, a, q)); - m_gif_packet->AppendItem(rootId, wxString::Format("R = %u", r)); - m_gif_packet->AppendItem(rootId, wxString::Format("G = %u", g)); - m_gif_packet->AppendItem(rootId, wxString::Format("B = %u", b)); - m_gif_packet->AppendItem(rootId, wxString::Format("A = %u", a)); - m_gif_packet->AppendItem(rootId, wxString::Format("Q = %g", q)); - break; - } - case GIFReg::ST: - { - float s = BitCast(data._u32[0]); - float t = BitCast(data._u32[1]); - m_gif_packet->AppendItem(rootId, wxString::Format("S = %g", s)); - m_gif_packet->AppendItem(rootId, wxString::Format("T = %g", t)); - if (packed) - { - m_stored_q = BitCast(data._u32[2]); - m_gif_packet->AppendItem(rootId, wxString::Format("Q = %g", m_stored_q)); - m_gif_packet->SetItemText(rootId, wxString::Format("%s - (%g, %g, %g)", GSDumpTypes::GetName(reg), s, t, m_stored_q)); - } - else - { - m_gif_packet->SetItemText(rootId, wxString::Format("%s - (%g, %g)", GSDumpTypes::GetName(reg), s, t)); - } - break; - } - case GIFReg::UV: - { - float u = static_cast(GetBits(data, 0, 14)) / 16.f; - float v = static_cast(GetBits(data, packed ? 32 : 16, 14)) / 16.f; - m_gif_packet->AppendItem(rootId, wxString::Format("U = %g", u)); - m_gif_packet->AppendItem(rootId, wxString::Format("V = %g", v)); - m_gif_packet->SetItemText(rootId, wxString::Format("%s - (%g, %g)", GSDumpTypes::GetName(reg), u, v)); - break; - } - case GIFReg::XYZF2: - case GIFReg::XYZF3: - { - const char* name = GSDumpTypes::GetName(reg); - if (packed && (reg == GIFReg::XYZF2) && GetBits(data, 111, 1)) - name = GSDumpTypes::GetName(GIFReg::XYZF3); - - float x, y; - u32 z, f; - - if (packed) - { - x = static_cast(GetBits(data, 0, 16)) / 16.0; - y = static_cast(GetBits(data, 32, 16)) / 16.0; - z = GetBits(data, 68, 24); - f = GetBits(data, 100, 8); - } - else - { - x = static_cast(GetBits(data, 0, 16)) / 16.0; - y = static_cast(GetBits(data, 16, 16)) / 16.0; - z = GetBits(data, 32, 24); - f = GetBits(data, 56, 8); - } - - m_gif_packet->SetItemText(rootId, wxString::Format("%s - (%g, %g, %u, %u)", name, x, y, z, f)); - m_gif_packet->AppendItem(rootId, wxString::Format("X = %g", x)); - m_gif_packet->AppendItem(rootId, wxString::Format("Y = %g", y)); - m_gif_packet->AppendItem(rootId, wxString::Format("Z = %u", z)); - m_gif_packet->AppendItem(rootId, wxString::Format("F = %u", f)); - break; - } - case GIFReg::XYZ2: - case GIFReg::XYZ3: - { - const char* name = GSDumpTypes::GetName(reg); - if (packed && (reg == GIFReg::XYZ2) && GetBits(data, 111, 1)) - name = GSDumpTypes::GetName(GIFReg::XYZ3); - - float x, y; - u32 z; - std::vector xyz_infos(3); - if (packed) - { - x = static_cast(GetBits(data, 0, 16)) / 16.0; - y = static_cast(GetBits(data, 32, 16)) / 16.0; - z = data._u32[2]; - } - else - { - x = static_cast(GetBits(data, 0, 16)) / 16.0; - y = static_cast(GetBits(data, 16, 16)) / 16.0; - z = data._u32[1]; - } - - m_gif_packet->SetItemText(rootId, wxString::Format("%s - (%g, %g, %u)", name, x, y, z)); - m_gif_packet->AppendItem(rootId, wxString::Format("X = %g", x)); - m_gif_packet->AppendItem(rootId, wxString::Format("Y = %g", y)); - m_gif_packet->AppendItem(rootId, wxString::Format("Z = %u", z)); - break; - } - case GIFReg::TEX0_1: - case GIFReg::TEX0_2: - { - u32 psm = GetBits(data, 20, 6); - u32 tw = GetBits(data, 26, 4); - u32 th = GetBits(data, 30, 4); - - m_gif_packet->SetItemText(rootId, wxString::Format("%s - %ux%u %s", GSDumpTypes::GetName(reg), 1 << tw, 1 << th, GetNameTEXPSM(psm))); - m_gif_packet->AppendItem(rootId, wxString::Format("TBP0 = %u", GetBits(data, 0, 14))); - m_gif_packet->AppendItem(rootId, wxString::Format("TBW = %u", GetBits(data, 14, 6))); - m_gif_packet->AppendItem(rootId, wxString::Format("PSM = %s", GetNameTEXPSM(psm))); - m_gif_packet->AppendItem(rootId, wxString::Format("TW = %u", tw)); - m_gif_packet->AppendItem(rootId, wxString::Format("TH = %u", th)); - m_gif_packet->AppendItem(rootId, wxString::Format("TCC = %s", GetNameTEXTCC (GetBits(data, 34, 1)))); - m_gif_packet->AppendItem(rootId, wxString::Format("TFX = %s", GetNameTEXTFX (GetBits(data, 35, 2)))); - m_gif_packet->AppendItem(rootId, wxString::Format("CBP = %u", GetBits(data, 37, 14))); - m_gif_packet->AppendItem(rootId, wxString::Format("CPSM = %s", GetNameTEXCPSM(GetBits(data, 51, 4)))); - m_gif_packet->AppendItem(rootId, wxString::Format("CSM = %s", GetNameTEXCSM (GetBits(data, 55, 1)))); - m_gif_packet->AppendItem(rootId, wxString::Format("CSA = %u", GetBits(data, 56, 5))); - m_gif_packet->AppendItem(rootId, wxString::Format("CLD = %u", GetBits(data, 61, 3))); - break; - } - case GIFReg::FOG: - { - u32 f = GetBits(data, packed ? 100 : 56, 8); - m_gif_packet->AppendItem(rootId, wxString::Format("F = %u", f)); - m_gif_packet->SetItemText(rootId, wxString::Format("%s - %u", GSDumpTypes::GetName(reg), f)); - break; - } - case GIFReg::AD: - { - GIFReg nreg = GetBits(data, 64, 8); - if (nreg == GIFReg::AD) - { - wxString s; - s.Printf("NOP"); - m_gif_packet->AppendItem(id, s); - } - else - ParseTreeReg(id, nreg, data, packed); - m_gif_packet->Delete(rootId); - break; - } - default: - break; - } -} - -void Dialogs::GSDumpDialog::ParseTreePrim(wxTreeItemId& id, u32 prim) -{ - std::array prim_infos; - - prim_infos[0].Printf("Primitive Type = %s", GetNamePRIMPRIM(GetBits(prim, 0, 3))); - prim_infos[1].Printf("IIP = %s", GetNamePRIMIIP(GetBits(prim, 3, 1))); - prim_infos[2].Printf("TME = %s", GetNameBool(GetBits(prim, 4, 1))); - prim_infos[3].Printf("FGE = %s", GetNameBool(GetBits(prim, 5, 1))); - prim_infos[4].Printf("ABE = %s", GetNameBool(GetBits(prim, 6, 1))); - prim_infos[5].Printf("AA1 = %s", GetNameBool(GetBits(prim, 7, 1))); - prim_infos[6].Printf("FST = %s", GetNamePRIMFST(GetBits(prim, 8, 1))); - prim_infos[7].Printf("CTXT = %s", GetNamePRIMCTXT(GetBits(prim, 9, 1))); - prim_infos[8].Printf("FIX = %s", GetNamePRIMFIX(GetBits(prim, 10, 1))); - - for (auto& el : prim_infos) - m_gif_packet->AppendItem(id, el); - m_gif_packet->Expand(id); -} - -void Dialogs::GSDumpDialog::ProcessDumpEvent(const GSDumpFile::GSData& event, u8* regs) -{ - switch (event.id) - { - case GSType::Transfer: - { - switch (event.path) - { - case GSTransferPath::Path1Old: - { - std::unique_ptr data(new char[16384]); - int addr = 16384 - event.length; - memcpy(data.get(), event.data + addr, event.length); - GSgifTransfer1((u8*)data.get(), addr); - break; - } - case GSTransferPath::Path1New: - GSgifTransfer((u8*)event.data, event.length / 16); - break; - case GSTransferPath::Path2: - GSgifTransfer2((u8*)event.data, event.length / 16); - break; - case GSTransferPath::Path3: - GSgifTransfer3((u8*)event.data, event.length / 16); - break; - default: - break; - } - break; - } - case GSType::VSync: - { - GSvsync((*((int*)(regs + 4096)) & 0x2000) > 0 ? (u8)0 : (u8)1, false); - g_FrameCount++; - break; - } - case GSType::ReadFIFO2: - { - std::unique_ptr arr(new u8[*((int*)event.data) * 16]); - GSInitAndReadFIFO(arr.get(), *((int*)event.data)); - break; - } - case GSType::Registers: - memcpy(regs, event.data, 8192); - break; - } -} - -// -------------------------------------------------------------------------------------- -// GSThread Implementation -// -------------------------------------------------------------------------------------- - -Dialogs::GSDumpDialog::GSThread::GSThread(GSDumpDialog* dlg) - : pxThread("GSDump") - , m_root_window(dlg) -{ -} - -Dialogs::GSDumpDialog::GSThread::~GSThread() -{ - try - { - pxThread::Cancel(); - } - DESTRUCTOR_CATCHALL -} - -void Dialogs::GSDumpDialog::GSThread::OnStop() -{ - m_root_window->m_button_events.clear(); - m_dump_file = nullptr; - - wxCommandEvent event(EVT_CLOSE_DUMP); - wxPostEvent(m_root_window, event); -} - -void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread() -{ - if (!m_dump_file->ReadFile()) - { - OnStop(); - return; - } - - GSRendererType renderer = g_Conf->EmuOptions.GS.Renderer; - if (m_renderer > 0 && static_cast(m_renderer) <= std::size(s_renderer_overrides)) - renderer = s_renderer_overrides[m_renderer - 1]; - - GSinit(); - sApp.OpenGsPanel(); - - // to gather the gs frame object we have to be a bit hacky since sApp is not syntax complete - Pcsx2App* app = (Pcsx2App*)wxApp::GetInstance(); - GSFrame* window = nullptr; - if (app) - { - PerformanceMetrics::Reset(); - window = app->GetGsFramePtr(); - g_FrameCount = 0; - } - - Pcsx2Config::GSOptions config(g_Conf->EmuOptions.GS); - config.MaskUserHacks(); - config.MaskUpscalingHacks(); - if (!m_dump_file->GetSerial().empty()) - { - if (const GameDatabaseSchema::GameEntry* entry = GameDatabase::findGame(m_dump_file->GetSerial()); entry) - { - // apply hardware fixes to config before opening (e.g. tex in rt) - entry->applyGSHardwareFixes(config); - } - } - - u8 regs[8192] = {}; - if (!m_dump_file->GetRegsData().empty()) - std::memcpy(regs, m_dump_file->GetRegsData().data(), std::min(m_dump_file->GetRegsData().size(), sizeof(regs))); - - if (!GSopen(config, renderer, regs)) - { - OnStop(); - return; - } - - GSsetGameCRC((int)m_dump_file->GetCRC(), 0); - - freezeData fd = {static_cast(m_dump_file->GetStateData().size()), - const_cast(m_dump_file->GetStateData().data())}; - if (GSfreeze(FreezeAction::Load, &fd)) - { - OnStop(); - return; - } - - GSvsync(1, false); - GSreset(false); - GSfreeze(FreezeAction::Load, &fd); - - size_t i = 0; - m_debug_index = 0; - size_t debug_idx = 0; - - GSDump::isRunning = true; - while (GSDump::isRunning) - { - if (m_debug) - { - if (m_root_window->m_button_events.size() > 0) - { - switch (m_root_window->m_button_events[0].btn) - { - case Step: - if (debug_idx >= m_dump_file->GetPackets().size()) - debug_idx = 0; - m_debug_index = debug_idx; - break; - case RunCursor: - m_debug_index = m_root_window->m_button_events[0].index; - if (debug_idx > m_debug_index) - debug_idx = 0; - break; - case RunVSync: - if (debug_idx >= m_dump_file->GetPackets().size()) - debug_idx = 1; - if ((debug_idx + 1) < m_dump_file->GetPackets().size()) - { - auto it = std::find_if(m_dump_file->GetPackets().begin() + debug_idx + 1, m_dump_file->GetPackets().end(), [](const GSDumpFile::GSData& gs) { return gs.id == GSType::Registers; }); - if (it != std::end(m_dump_file->GetPackets())) - m_debug_index = std::distance(m_dump_file->GetPackets().begin(), it); - } - break; - } - m_root_window->m_button_events.erase(m_root_window->m_button_events.begin()); - - if (debug_idx <= m_debug_index) - { - while (debug_idx <= m_debug_index) - { - m_root_window->ProcessDumpEvent(m_dump_file->GetPackets()[debug_idx++], regs); - } - if ((debug_idx + 1) < m_dump_file->GetPackets().size()) - { - auto it = std::find_if(m_dump_file->GetPackets().begin() + debug_idx + 1, m_dump_file->GetPackets().end(), [](const GSDumpFile::GSData& gs) { return gs.id == GSType::Registers; }); - if (it != std::end(m_dump_file->GetPackets())) - m_root_window->ProcessDumpEvent(*it, regs); - } - } - - // do vsync - m_root_window->ProcessDumpEvent({GSType::VSync, 0, 0, GSTransferPath::Dummy}, regs); - } - } - else if (m_dump_file->GetPackets().size()) - { - while (i < m_dump_file->GetPackets().size()) - { - const GSDumpFile::GSData& packet = m_dump_file->GetPackets()[i++]; - m_root_window->ProcessDumpEvent(packet, regs); - if (packet.id == GSType::VSync) - { - if (m_frame_ticks) - { - // Frame limiter - u64 now = GetCPUTicks(); - s64 ms = GetTickFrequency() / 1000; - s64 sleep = m_next_frame_time - now - ms; - if (sleep > ms) - Threading::Sleep(sleep / ms); - while ((now = GetCPUTicks()) < m_next_frame_time) - ShortSpin(); - m_next_frame_time = std::max(now, m_next_frame_time + m_frame_ticks); - } - break; - } - } - - if (i >= m_dump_file->GetPackets().size()) - i = 0; - } - if (window) - { - if (!window->IsShown()) - { - GSclose(); - GSshutdown(); - sApp.CloseGsPanel(); - GSDump::isRunning = false; - } - } - } - - OnStop(); - return; -} diff --git a/pcsx2/gui/Dialogs/ImportSettingsDialog.cpp b/pcsx2/gui/Dialogs/ImportSettingsDialog.cpp deleted file mode 100644 index cc9219c3f7..0000000000 --- a/pcsx2/gui/Dialogs/ImportSettingsDialog.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "System.h" -#include "gui/MSWstuff.h" - -#include "ModalPopups.h" - -using namespace pxSizerFlags; - -Dialogs::ImportSettingsDialog::ImportSettingsDialog( wxWindow* parent ) - : wxDialogWithHelpers( parent, _("Import Existing Settings?") ) -{ - SetMinWidth( MSW_GetDPIScale() * 440 ); - - pxStaticText& heading( Text( pxsFmt( - - /// (%s is the app name, normally PCSX2 -- omitting one or both %s is allowed) - pxE( L"Existing %s settings have been found in the configured settings folder. Would you like to import these settings or overwrite them with %s default values?\n\n(or press Cancel to select a different settings folder)" - ), WX_STR(pxGetAppName()), WX_STR(pxGetAppName()) - ))); - - wxBoxSizer& s_buttons = *new wxBoxSizer( wxHORIZONTAL ); - wxButton* b_import = new wxButton( this, wxID_ANY, _("Import") ); - wxButton* b_over = new wxButton( this, wxID_ANY, _("Overwrite") ); - - // -------------------------------------------------------------------- - // Layout Some Shizat... - - s_buttons += b_import | StdButton(); - s_buttons += 16; - s_buttons += b_over | StdButton(); - s_buttons += 16; - s_buttons += new wxButton( this, wxID_CANCEL ) | StdButton(); - - *this += 4; - *this += heading | StdExpand(); - *this += 12; - *this += &s_buttons | StdCenter(); - - Bind(wxEVT_BUTTON, &ImportSettingsDialog::OnImport_Click, this, b_import->GetId()); - Bind(wxEVT_BUTTON, &ImportSettingsDialog::OnOverwrite_Click, this, b_over->GetId()); -} - -void Dialogs::ImportSettingsDialog::OnImport_Click( wxCommandEvent& /* evt */ ) -{ - AppConfig_OnChangedSettingsFolder( false ); // ... and import existing settings - g_Conf->Folders.Bios.Mkdir(); - EndModal( wxID_OK ); -} - -void Dialogs::ImportSettingsDialog::OnOverwrite_Click( wxCommandEvent& /* evt */ ) -{ - AppConfig_OnChangedSettingsFolder( true ); // ... and overwrite any existing settings - g_Conf->Folders.Bios.Mkdir(); - EndModal( wxID_OK ); -} diff --git a/pcsx2/gui/Dialogs/LogOptionsDialog.cpp b/pcsx2/gui/Dialogs/LogOptionsDialog.cpp deleted file mode 100644 index d882aebb21..0000000000 --- a/pcsx2/gui/Dialogs/LogOptionsDialog.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "LogOptionsDialog.h" -#include "gui/Panels/LogOptionsPanels.h" - -#include - -using namespace Panels; -using namespace pxSizerFlags; - - -Dialogs::LogOptionsDialog::LogOptionsDialog( wxWindow* parent ) - : BaseConfigurationDialog( parent, _("Trace Logging"), 720 ) -{ - *this += new LogOptionsPanel( this ) | StdExpand(); - AddOkCancel(); - - SetSizerAndFit(GetSizer()); -} diff --git a/pcsx2/gui/Dialogs/LogOptionsDialog.h b/pcsx2/gui/Dialogs/LogOptionsDialog.h deleted file mode 100644 index 31171c3ee2..0000000000 --- a/pcsx2/gui/Dialogs/LogOptionsDialog.h +++ /dev/null @@ -1,47 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "gui/App.h" -#include "ConfigurationDialog.h" - -#include "gui/wxGuiTools.h" -#include "gui/CheckedStaticBox.h" - -namespace Dialogs { - -class LogOptionsDialog : public BaseConfigurationDialog -{ -public: - LogOptionsDialog( wxWindow* parent=NULL ); - virtual ~LogOptionsDialog() = default; - - static wxString GetNameStatic() { return L"TraceLogSettings"; } - wxString GetDialogName() const { return GetNameStatic(); } - -protected: - void OnOk_Click( wxCommandEvent& evt ); - void OnApply_Click( wxCommandEvent& evt ); - - wxString& GetConfSettingsTabName() const - { - static wxString bleh = L"TraceLogs"; - pxFailDev("No tabs yet!"); - return bleh; - } -}; - -} // end namespace Dialogs diff --git a/pcsx2/gui/Dialogs/McdConfigDialog.cpp b/pcsx2/gui/Dialogs/McdConfigDialog.cpp deleted file mode 100644 index 31a7e29dc7..0000000000 --- a/pcsx2/gui/Dialogs/McdConfigDialog.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "ConfigurationDialog.h" -#include "BaseConfigurationDialog.inl" -#include "ModalPopups.h" -#include "gui/MSWstuff.h" - -#include "gui/Panels/ConfigurationPanels.h" -#include "gui/Panels/MemoryCardPanels.h" - -using namespace pxSizerFlags; - -wxString GetMsg_McdNtfsCompress() -{ - return pxE( L"NTFS compression is built-in, fast, and completely reliable; and typically compresses memory cards very well (this option is highly recommended)." - ); -} - -Panels::McdConfigPanel_Toggles::McdConfigPanel_Toggles(wxWindow *parent) - : _parent( parent ) -{ - m_check_Ejection = new pxCheckBox( this, - _("Auto-eject memory cards when loading savestates"), - pxE( L"Avoids broken memory card saves. May not work with some games such as Guitar Hero." - ) - ); - - m_folderAutoIndex = new pxCheckBox( this, - _( "Automatically manage saves based on running game" ), - pxE( L"(Folder type only / Card size: Auto) Loads only the relevant booted game saves, ignoring others. Avoids running out of space for saves." - ) - ); - - //m_check_SavestateBackup = new pxCheckBox( this, pxsFmt(_("Backup existing Savestate when creating a new one")) ); -/* - for( uint i=0; i<2; ++i ) - { - m_check_Multitap[i] = new pxCheckBox( this, pxsFmt(_("Use Multitap on Port %u"), i+1) ); - m_check_Multitap[i]->SetClientData( (void*)i ); - m_check_Multitap[i]->SetName(pxsFmt( L"CheckBox::Multitap%u", i )); - } - - // ------------------------------ - // Sizers and Layout Section - // ------------------------------ - - for( uint i=0; i<2; ++i ) - *this += m_check_Multitap[i]; - - // *this += 4; - - // *this += m_check_SavestateBackup; -*/ - *this += 4; - *this += new wxStaticLine( this ) | StdExpand(); - - *this += m_check_Ejection | StdExpand(); - *this += m_folderAutoIndex | StdExpand(); -} - -void Panels::McdConfigPanel_Toggles::Apply() -{ -// g_Conf->EmuOptions.MultitapPort0_Enabled = m_check_Multitap[0]->GetValue(); -// g_Conf->EmuOptions.MultitapPort1_Enabled = m_check_Multitap[1]->GetValue(); - - //g_Conf->EmuOptions.BackupSavestate = m_check_SavestateBackup->GetValue(); - g_Conf->EmuOptions.McdEnableEjection = m_check_Ejection->GetValue(); - g_Conf->EmuOptions.McdFolderAutoManage = m_folderAutoIndex->GetValue(); -} - -void Panels::McdConfigPanel_Toggles::AppStatusEvent_OnSettingsApplied() -{ -// m_check_Multitap[0] ->SetValue( g_Conf->EmuOptions.MultitapPort0_Enabled ); -// m_check_Multitap[1] ->SetValue( g_Conf->EmuOptions.MultitapPort1_Enabled ); - - //m_check_SavestateBackup ->SetValue( g_Conf->EmuOptions.BackupSavestate ); - m_check_Ejection ->SetValue( g_Conf->EmuOptions.McdEnableEjection ); - m_folderAutoIndex ->SetValue( g_Conf->EmuOptions.McdFolderAutoManage ); -} - - -using namespace Panels; -using namespace pxSizerFlags; - -Dialogs::McdConfigDialog::McdConfigDialog( wxWindow* parent ) - : BaseConfigurationDialog( parent, _("MemoryCard Manager"), 600 ) -{ - m_panel_mcdlist = new MemoryCardListPanel_Simple( this ); - SetIcons(wxGetApp().GetIconBundle()); - - wxFlexGridSizer* s_flex=new wxFlexGridSizer(3,1, 0, 0); - s_flex->AddGrowableCol(0); - s_flex->AddGrowableRow(1); - - //set own sizer to s_flex (3-rows-1-col table with growable width and growable middle-row-height) - // instead of the default vertical sizer which cannot expand vertically. - // (vertical sizers can expand horizontally and consume the minimum vertical height possible) - SetSizer(s_flex); - - wxBoxSizer* s_top = new wxBoxSizer(wxVERTICAL); - - wxString title=_("Drag cards to or from PS2-ports"); - title+=_("\nNote: Duplicate/Rename/Create/Delete will NOT be reverted with 'Cancel'."); - - *s_top += Heading(title) | StdExpand(); - *s_top += StdPadding; - - *this += s_top | StdExpand(); - *this+= m_panel_mcdlist | StdExpand(); - - wxBoxSizer* s_bottom = new wxBoxSizer(wxVERTICAL); - *s_bottom += StdPadding; - *s_bottom += new McdConfigPanel_Toggles( this ) | StdExpand(); - - *this+= s_bottom | StdExpand(); -/* - for( uint i=0; i<2; ++i ) - { - if( pxCheckBox* check = (pxCheckBox*)FindWindow(pxsFmt( L"CheckBox::Multitap%u", i )) ) - Bind(wxEVT_CHECKBOX, &McdConfigDialog::OnMultitapClicked, this, check->GetId()); - } -*/ - AddOkCancel(s_bottom); - - //make this dialog fit to current elements (else can be shrinked too much) - // [There seem to be a bug in wxWidgets which prevents Fit() to succeed by itself, - // So using the "bigger" method: SetSizerAndFit, with existing sizer (set earlier to s_flex) - avih] - SetSizerAndFit(GetSizer()); -} -/* -void Dialogs::McdConfigDialog::OnMultitapClicked( wxCommandEvent& evt ) -{ - evt.Skip(); - if( !m_panel_mcdlist ) return; - - if( pxCheckBox* box = (pxCheckBox*)evt.GetEventObject() ) - m_panel_mcdlist->SetMultitapEnabled( (int)box->GetClientData(), box->IsChecked() ); -} -*/ diff --git a/pcsx2/gui/Dialogs/ModalPopups.h b/pcsx2/gui/Dialogs/ModalPopups.h deleted file mode 100644 index 8d9b40f397..0000000000 --- a/pcsx2/gui/Dialogs/ModalPopups.h +++ /dev/null @@ -1,225 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "gui/App.h" -#include "ConfigurationDialog.h" -#include "gui/Panels/ConfigurationPanels.h" -#include "GS/GSLzma.h" - -#include -#include -#include - -class FirstTimeWizard : public wxWizard -{ - typedef wxWizard _parent; - -protected: - wxWizardPageSimple& m_page_intro; - wxWizardPageSimple& m_page_bios; - - wxPanelWithHelpers& m_panel_Intro; - Panels::BiosSelectorPanel& m_panel_BiosSel; - -public: - FirstTimeWizard(wxWindow* parent); - virtual ~FirstTimeWizard() = default; - - wxWizardPage* GetFirstPage() const { return &m_page_intro; } - - int ShowModal(); - -protected: - virtual void OnPageChanging(wxWizardEvent& evt); - virtual void OnPageChanged(wxWizardEvent& evt); - virtual void OnDoubleClicked(wxCommandEvent& evt); - - void OnRestartWizard(wxCommandEvent& evt); -}; - - -namespace Dialogs -{ - class AboutBoxDialog : public wxDialogWithHelpers - { - public: - AboutBoxDialog(wxWindow* parent = NULL); - virtual ~AboutBoxDialog() = default; - - static wxString GetNameStatic() { return L"AboutBox"; } - wxString GetDialogName() const { return GetNameStatic(); } - }; - - class GSDumpDialog : public wxDialogWithHelpers - { - public: - GSDumpDialog(wxWindow* parent = NULL); - virtual ~GSDumpDialog() = default; - - static wxString GetNameStatic() - { - return L"GS Debugger"; - } - wxString GetDialogName() const - { - return GetNameStatic(); - } - - protected: - wxListView* m_dump_list; - wxStaticBitmap* m_preview_image; - wxString m_selected_dump; - wxCheckBox* m_debug_mode; - wxRadioBox* m_renderer_overrides; - wxSpinCtrl* m_framerate_selector; - wxTreeCtrl* m_gif_list; - wxTreeCtrl* m_gif_packet; - wxButton* m_start; - wxButton* m_step; - wxButton* m_selection; - wxButton* m_vsync; - wxButton* m_settings; - wxButton* m_run; - long m_focused_dump; - wxFileSystemWatcher m_fs_watcher; - - void GetDumpsList(); - void UpdateFramerate(int val); - void UpdateFramerate(wxCommandEvent& evt); - void SelectedDump(wxListEvent& evt); - void RunDump(wxCommandEvent& event); - void ToStart(wxCommandEvent& event); - void StepPacket(wxCommandEvent& event); - void ToCursor(wxCommandEvent& event); - void ToVSync(wxCommandEvent& event); - void OpenSettings(wxCommandEvent& event); - void ParsePacket(wxTreeEvent& event); - void CheckDebug(wxCommandEvent& event); - void PathChanged(wxFileSystemWatcherEvent& event); - enum - { - ID_DUMP_LIST, - ID_RUN_DUMP, - ID_RUN_START, - ID_RUN_STEP, - ID_RUN_CURSOR, - ID_RUN_VSYNC, - ID_SEL_PACKET, - ID_DEBUG_MODE, - ID_SETTINGS, - ID_FRAMERATE, - }; - - enum ButtonState - { - Step, - RunCursor, - RunVSync - }; - - struct GSEvent - { - ButtonState btn; - int index; - }; - std::vector m_button_events; - std::vector m_gif_items; - - float m_stored_q = 1.0; - void ProcessDumpEvent(const GSDumpFile::GSData& event, u8* regs); - u32 ReadPacketSize(const void* packet); - void GenPacketList(); - void GenPacketInfo(const GSDumpFile::GSData& dump); - void ParseTransfer(wxTreeItemId& id, const u8* data); - void ParseTreeReg(wxTreeItemId& id, GSDumpTypes::GIFReg reg, u128 data, bool packed); - void ParseTreePrim(wxTreeItemId& id, u32 prim); - void CloseDump(wxCommandEvent& event); - class GSThread : public pxThread - { - protected: - // parent thread - typedef pxThread _parent; - void ExecuteTaskInThread(); - void OnStop(); - GSDumpDialog* m_root_window; - - public: - int m_renderer = 0; - u64 m_frame_ticks = 0; - u64 m_next_frame_time = 0; - bool m_debug = false; - size_t m_debug_index; - std::unique_ptr m_dump_file; - GSThread(GSDumpDialog* dlg); - virtual ~GSThread(); - }; - std::unique_ptr m_thread; - }; - - - class PickUserModeDialog : public BaseApplicableDialog - { - protected: - Panels::DocsFolderPickerPanel* m_panel_usersel; - Panels::LanguageSelectionPanel* m_panel_langsel; - - public: - PickUserModeDialog(wxWindow* parent); - virtual ~PickUserModeDialog() = default; - - protected: - void OnOk_Click(wxCommandEvent& evt); - }; - - - class ImportSettingsDialog : public wxDialogWithHelpers - { - public: - ImportSettingsDialog(wxWindow* parent); - virtual ~ImportSettingsDialog() = default; - - protected: - void OnImport_Click(wxCommandEvent& evt); - void OnOverwrite_Click(wxCommandEvent& evt); - }; - - class AssertionDialog : public wxDialogWithHelpers - { - public: - AssertionDialog(const wxString& text, const wxString& stacktrace); - virtual ~AssertionDialog() = default; - }; - - class PINEDialog : public wxDialogWithHelpers - { - public: - PINEDialog(wxWindow* parent = NULL); - virtual ~PINEDialog() = default; - - void OnConfirm(wxCommandEvent& evt); - static wxString GetNameStatic() { return L"PINESettings"; } - wxString GetDialogName() const { return GetNameStatic(); } - }; -} // namespace Dialogs - -wxWindowID pxIssueConfirmation(wxDialogWithHelpers& confirmDlg, const MsgButtons& buttons); -wxWindowID pxIssueConfirmation(wxDialogWithHelpers& confirmDlg, const MsgButtons& buttons, const wxString& disablerKey); - -namespace GSDump -{ - extern bool isRunning; -} diff --git a/pcsx2/gui/Dialogs/PINEDialog.cpp b/pcsx2/gui/Dialogs/PINEDialog.cpp deleted file mode 100644 index acd02aa7ab..0000000000 --- a/pcsx2/gui/Dialogs/PINEDialog.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "gui/AppCommon.h" -#include "gui/MSWstuff.h" - -#include "gui/Dialogs/ModalPopups.h" - -#include "gui/SysThreads.h" - -#include "gui/PathDefs.h" -#include "gui/AppConfig.h" - -using namespace pxSizerFlags; -/* This dialog currently assumes the PINE server is started when launching a - * game, as such we can allow the IPC Settings window to change the slot in a - * volatile fashion so that it returns to the default but you can change it at - * each restart of the emulator to allow for multiple emulator sessions. - * If we change this behaviour we will need to change that accordingly. - */ - -// -------------------------------------------------------------------------------------- -// PINEDialog Implementation -// -------------------------------------------------------------------------------------- - -Dialogs::PINEDialog::PINEDialog(wxWindow* parent) - : wxDialogWithHelpers(parent, _("PINE Settings"), pxDialogFlags()) -{ - wxTextCtrl* ipc_slot = new wxTextCtrl(this, wxID_ANY, wxString::Format(wxT("%u"), PINESettings::slot), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - ipc_slot->Bind(wxEVT_TEXT_ENTER, &Dialogs::PINEDialog::OnConfirm, this); - - *this += new wxStaticText(this, wxID_ANY, _("PINE Slot")); - *this += ipc_slot; -} - -void Dialogs::PINEDialog::OnConfirm(wxCommandEvent& evt) -{ - wxTextCtrl* obj = static_cast(evt.GetEventObject()); - if (obj != nullptr) - { - PINESettings::slot = (unsigned int)atoi(obj->GetValue().ToUTF8().data()); - Destroy(); - } -} diff --git a/pcsx2/gui/Dialogs/PickUserModeDialog.cpp b/pcsx2/gui/Dialogs/PickUserModeDialog.cpp deleted file mode 100644 index fde3bcfed2..0000000000 --- a/pcsx2/gui/Dialogs/PickUserModeDialog.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ModalPopups.h" - -#include - -using namespace Panels; - -Dialogs::PickUserModeDialog::PickUserModeDialog( wxWindow* parent ) - : BaseApplicableDialog( parent, _("PCSX2 First Time configuration") ) -{ - m_panel_usersel = new DocsFolderPickerPanel( this, false ); - m_panel_langsel = new LanguageSelectionPanel( this ); - - *this += Heading(AddAppName(_("%s is starting from a new or unknown folder and needs to be configured."))); - *this += m_panel_langsel | pxSizerFlags::StdCenter(); - *this += m_panel_usersel | wxSizerFlags().Expand().Border( wxALL, 8 ); - - AddOkCancel( *GetSizer() ); - - Bind(wxEVT_BUTTON, &PickUserModeDialog::OnOk_Click, this, wxID_OK); - // TODO : Add a command event handler for language changes, that dynamically re-update contents of this window. -} - -void Dialogs::PickUserModeDialog::OnOk_Click( wxCommandEvent& evt ) -{ - if( m_ApplyState.ApplyAll() ) - { - Close(); - evt.Skip(); - } -} diff --git a/pcsx2/gui/Dialogs/SysConfigDialog.cpp b/pcsx2/gui/Dialogs/SysConfigDialog.cpp deleted file mode 100644 index fed19c930f..0000000000 --- a/pcsx2/gui/Dialogs/SysConfigDialog.cpp +++ /dev/null @@ -1,242 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "System.h" -#include "gui/App.h" - -#include "ConfigurationDialog.h" -#include "BaseConfigurationDialog.inl" -#include "ModalPopups.h" -#include "gui/Panels/ConfigurationPanels.h" -#include "gui/MainFrame.h" - -using namespace Panels; -using namespace pxSizerFlags; - -static void CheckHacksOverrides() -{ - if( !wxGetApp().Overrides.HasCustomHacks() ) return; - - // The user has commandline overrides enabled, so the options they see here and/or apply won't match - // the commandline overrides. Let them know! - - wxDialogWithHelpers dialog( wxFindWindowByName( L"Dialog:" + Dialogs::SysConfigDialog::GetNameStatic() ), _("Config Overrides Warning") ); - - dialog += dialog.Text( pxEt( L"Warning! You are running PCSX2 with command line options that override your configured settings. These command line options will not be reflected in the Settings dialog, and will be disabled if you apply any changes here." - )); - - // [TODO] : List command line option overrides in action? - - pxIssueConfirmation( dialog, MsgButtons().OK(), L"Dialog.SysConfig.Overrides" ); -} - -//Behavior when unchecking 'Presets' is to keep the GUI settings at the last preset (even if not yet applied). -// -//Alternative possible behavior when unchecking 'Presets' (currently not implemented) is to set the GUI to -// the last applied settings. If such behavior is to be implemented, g_Conf->EnablePresets should be set to -// false before it's applied to the GUI and then restored to it's original state such that the GUI reflects -// g_Conf's settings as if it doesn't force presets. (if a settings which has presets enable is applied to the -// GUI then most of the GUI is disabled). -void Dialogs::SysConfigDialog::UpdateGuiForPreset ( int presetIndex, bool presetsEnabled ) -{ - if( !m_listbook ) - return; - - //Console.WriteLn("Applying config to Gui: preset #%d, presets enabled: %s", presetIndex, presetsEnabled?"true":"false"); - - AppConfig preset = *g_Conf; - preset.IsOkApplyPreset( presetIndex, false ); //apply a preset to a copy of g_Conf. - preset.EnablePresets = presetsEnabled; //override IsOkApplyPreset (which always applies/enabled) to actual required state - - //update the config panels of SysConfigDialog to reflect the preset. - size_t pages = m_labels.GetCount(); - for( size_t i=0; iGetPage(i)) are of type wxNotebookPage which doesn't - // support IsSpecificConfig(), so the panels (pages) that SysConfigDialog holds must be of class - // BaseApplicableConfigPanel or derived, and not of the parent class wxNotebookPage. - if ( ((BaseApplicableConfigPanel*)(m_listbook->GetPage(i)))->IsSpecificConfig() ) - { - ((BaseApplicableConfigPanel_SpecificConfig*)(m_listbook->GetPage(i))) - ->ApplyConfigToGui( preset, AppConfig::APPLY_FLAG_FROM_PRESET | AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ); - } - } - - //Main menus behavior regarding presets and changes/cancel/apply from SysConfigDialog: - //1. As long as preset-related values were not changed at SysConfigDialog, menus behave normally. - //2. After the first preset-related change at SysConfigDialog (this function) and before Apply/Ok/Cancel: - // - The menus reflect the temporary pending values, but these preset-controlled items are grayed out even if temporarily presets is unchecked. - //3. When clicking Ok/Apply/Cancel at SysConfigDialog, the menus are re-alligned with g_Conf (including gray out or not as needed). - //NOTE: Enabling the presets and disabling them wihout clicking Apply leaves the pending menu config at last preset values - // (consistent with SysConfigDialog behavior). But unlike SysConfigDialog, the menu items stay grayed out. - // Clicking cancel will revert all pending changes, but clicking apply will commit them, and this includes the menus. - // E.g.: - // 1. Patches (menu) is disabled and presets (SysConfigDialog) is disabled. - // 2. Opening config and checking presets without apply --> patches are visually enabled and grayed out (not yet applied to g_Conf) - // 3. Unchecking presets, still without clicking apply --> patches are visually still enabled (last preset values) and grayed out. - // 4. Clicking Apply (presets still unchecked) --> patches will be enabled and not grayed out, presets are disabled. - // --> If clicking Cancel instead of Apply at 4., will revert everything to the state of 1 (preset disabled, patches disabled and not grayed out). - - bool origEnable=preset.EnablePresets; - preset.EnablePresets=true; // will cause preset-related items to be grayed out at the menus regardless of their value. - if ( GetMainFramePtr() ) - GetMainFramePtr()->ApplyConfigToGui( preset, AppConfig::APPLY_FLAG_FROM_PRESET | AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ); - - // Not really needed as 'preset' is local and dumped anyway. For the sake of future modifications of more GUI elements. - preset.EnablePresets=origEnable; - -} - -void Dialogs::SysConfigDialog::AddPresetsControl() -{ - m_slider_presets = new wxSlider( this, wxID_ANY, g_Conf->PresetIndex, 0, AppConfig::GetMaxPresetIndex(), - wxDefaultPosition, wxDefaultSize, wxHORIZONTAL /*| wxSL_AUTOTICKS | wxSL_LABELS */); - m_slider_presets->SetMinSize(wxSize(100,25)); - - const wchar_t* presetTooltip = pxEt(L"Presets apply some speed hacks that may boost speed on underpowered systems, or speed up games that have unusual performance requirements. Uncheck this box to apply settings manually.\n\n1) Safest - No speed hacks. Most reliable, but possibly slow setting.\n2) Safe - Default. A few speed hacks known to provide boosts, with minimal to no side effects.\n3) Balanced - May help quad core CPUs."); - - m_slider_presets->SetToolTip( - presetTooltip - ); - m_slider_presets->Enable(g_Conf->EnablePresets); - - m_check_presets = new pxCheckBox( this, _("Preset:"), 0); - m_check_presets->SetToolTip( - presetTooltip - ); - m_check_presets->SetValue(!!g_Conf->EnablePresets); - - g_Conf->PresetIndex = std::clamp(g_Conf->PresetIndex, 0, AppConfig::GetMaxPresetIndex()); - - //Console.WriteLn("--> SysConfigDialog::AddPresetsControl: EnablePresets: %s", g_Conf->EnablePresets?"true":"false"); - - wxString l; wxColor c(wxColour( L"Red" )); - AppConfig::isOkGetPresetTextAndColor(g_Conf->PresetIndex, l, c); - m_msg_preset = new pxStaticText(this, l, wxALIGN_LEFT); - m_msg_preset->Enable(g_Conf->EnablePresets); - m_msg_preset->SetForegroundColour( c ); - m_msg_preset->Bold(); - - //I'm unable to do without the next 2 rows.. what am I missing? - m_msg_preset->SetMinWidth(250); - m_msg_preset->Unwrapped(); - - - *m_extraButtonSizer += 20; - *m_extraButtonSizer += m_check_presets | pxMiddle; - *m_extraButtonSizer += m_slider_presets | pxMiddle; - *m_extraButtonSizer += 5; - *m_extraButtonSizer += m_msg_preset | pxMiddle; - - Bind(wxEVT_SCROLL_THUMBTRACK, &Dialogs::SysConfigDialog::Preset_Scroll, this, m_slider_presets->GetId()); - Bind(wxEVT_SCROLL_CHANGED, &Dialogs::SysConfigDialog::Preset_Scroll, this, m_slider_presets->GetId()); - Bind(wxEVT_CHECKBOX, &Dialogs::SysConfigDialog::Presets_Toggled, this, m_check_presets->GetId()); -} - - - -void Dialogs::SysConfigDialog::Presets_Toggled(wxCommandEvent &event) -{ - m_slider_presets->Enable( m_check_presets->IsChecked() ); - m_msg_preset->Enable( m_check_presets->IsChecked() ); - UpdateGuiForPreset( m_slider_presets->GetValue(), m_check_presets->IsChecked() ); - - event.Skip(); -} - - -void Dialogs::SysConfigDialog::Preset_Scroll(wxScrollEvent &event) -{ - wxString pl; - wxColor c; - AppConfig::isOkGetPresetTextAndColor(m_slider_presets->GetValue(), pl, c); - m_msg_preset->SetLabel(pl); - m_msg_preset->SetForegroundColour( c ); - - UpdateGuiForPreset( m_slider_presets->GetValue(), m_check_presets->IsChecked() ); - event.Skip(); -} - -//Write the values SysConfigDialog holds (preset index and enabled) to g_Conf. -//Make the main menu system write the presets values it holds to g_Conf (preset may have affected the gui without changing g_Conf) -//The panels will write themselves to g_Conf on apply (AFTER this function) and will also trigger a global OnSettingsApplied. -void Dialogs::SysConfigDialog::Apply() -{ - //Console.WriteLn("Applying preset to to g_Conf: Preset index: %d, EnablePresets: %s", (int)m_slider_presets->GetValue(), m_check_presets->IsChecked()?"true":"false"); - g_Conf->EnablePresets = m_check_presets->IsChecked(); - g_Conf->PresetIndex = m_slider_presets->GetValue(); - - if (GetMainFramePtr()) - GetMainFramePtr()->CommitPreset_noTrigger(); -} - -//Update the main menu system to reflect the original configuration on cancel. -//The config panels don't need this because they just reload themselves with g_Conf when re-opened next time. -//But the menu system has a mostly persistent state that reflects g_Conf (except for when presets are used). -void Dialogs::SysConfigDialog::Cancel() -{ - if (GetMainFramePtr()) - GetMainFramePtr()->ApplyConfigToGui( *g_Conf, AppConfig::APPLY_FLAG_FROM_PRESET | AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ); -} - -Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent) - : BaseConfigurationDialog( parent, AddAppName(_("General Settings - %s")), 580 ) -{ - ScopedBusyCursor busy( Cursor_ReallyBusy ); - - CreateListbook( wxGetApp().GetImgList_Config() ); - const AppImageIds::ConfigIds& cfgid( wxGetApp().GetImgId().Config ); - SetIcons(wxGetApp().GetIconBundle()); - - //NOTE: all pages which are added to SysConfigDialog must be of class BaseApplicableConfigPanel or derived. - // see comment inside UpdateGuiForPreset implementation for more info. - AddPage ( pxL("BIOS"), cfgid.Cpu ); - AddPage ( pxL("Folders"), cfgid.Paths ); - AddPage ( pxL("EE/IOP"), cfgid.Cpu ); - AddPage ( pxL("VUs"), cfgid.Cpu ); - AddPage ( pxL("GS"), cfgid.Cpu ); - AddPage ( pxL("GS Window"), cfgid.Video ); - AddPage ( pxL("Speedhacks"), cfgid.Speedhacks ); - AddPage ( pxL("Game Fixes"), cfgid.Gamefixes ); - - AddListbook(); - AddOkCancel(); - AddPresetsControl(); - - SetSizerAndFit(GetSizer()); - - if( wxGetApp().Overrides.HasCustomHacks() ) - wxGetApp().PostMethod( CheckHacksOverrides ); -} - -Dialogs::InterfaceLanguageDialog::InterfaceLanguageDialog(wxWindow* parent) - : BaseConfigurationDialog(parent, _("Language Selector"), 400) -{ - *this += 5; - - // Keep this in English - same as the menu item. - *this += Heading(L"Language switch will only affect newly opened windows.\n"); - *this += Heading(L"Full change will not apply until PCSX2 is restarted."); - *this += new Panels::LanguageSelectionPanel(this, false) | StdCenter(); - - AddOkCancel(); - - SetSizerAndFit(GetSizer()); -} - -bool g_ConfigPanelChanged = false; diff --git a/pcsx2/gui/DriveList.cpp b/pcsx2/gui/DriveList.cpp deleted file mode 100644 index 993ca7b2b6..0000000000 --- a/pcsx2/gui/DriveList.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "DriveList.h" -#include "MainFrame.h" -#include "CDVD/CDVDdiscReader.h" - -DriveList::DriveList() -{ - Menu = new wxMenu(); - Manager = std::unique_ptr(new DriveListManager(Menu)); -} - -DriveListManager::DriveListManager(wxMenu* menu) - : m_Menu(menu) -{ - m_Menu->Append(MenuId_DriveListRefresh, _("&Refresh")); - m_Menu->AppendSeparator(); - RefreshList(); - - // Bind on app level so that the event can be accessed outside DriveListManager - wxGetApp().Bind(wxEVT_MENU, &DriveListManager::OnRefreshClicked, this, MenuId_DriveListRefresh); -} - -void DriveListManager::ClearList() -{ - for (uint i = 0; i < m_Items.size(); i++) - { - m_Menu->Unbind(wxEVT_MENU, &DriveListManager::OnChangedSelection, this, m_Items.at(i)->itemPtr->GetId()); - m_Menu->Destroy(m_Items.at(i)->itemPtr); - } - - m_Items.clear(); -} - -void DriveListManager::RefreshList() -{ - ClearList(); - auto drives = GetOpticalDriveList(); - bool itemChecked = false; - - for (auto i : drives) - { - std::unique_ptr dli = std::unique_ptr(new DriveListItem()); - dli->driveLetter = fromUTF8(i); - dli->itemPtr = m_Menu->AppendRadioItem(wxID_ANY, dli->driveLetter); - - // Check the last used drive item - if (g_Conf->Folders.RunDisc == dli->driveLetter) - { - dli->itemPtr->Check(true); - itemChecked = true; - } - - m_Menu->Bind(wxEVT_MENU, &DriveListManager::OnChangedSelection, this, dli->itemPtr->GetId()); - m_Items.push_back(std::move(dli)); - } - - // Last used drive not found so use first found drive - if (itemChecked == false && m_Items.size() > 0) - { - m_Items.at(0)->itemPtr->Check(true); - - SysUpdateDiscSrcDrive(m_Items.at(0)->driveLetter); - } -} - -void DriveListManager::OnChangedSelection(wxCommandEvent& evt) -{ - uint index = m_Items.size(); - - for (uint i = 0; i < m_Items.size(); i++) - { - if ((m_Items.at(i)->itemPtr != NULL) && (m_Items.at(i)->itemPtr->GetId() == evt.GetId())) - { - index = i; - break; - } - } - - if (index >= m_Items.size()) - { - evt.Skip(); - return; - } - - m_Items.at(index)->itemPtr->Check(true); - - ScopedCoreThreadPopup paused_core; - SwapOrReset_Disc(m_Menu->GetWindow(), paused_core, m_Items.at(index)->driveLetter); -} - -void DriveListManager::OnRefreshClicked(wxCommandEvent& evt) -{ - RefreshList(); -} diff --git a/pcsx2/gui/DriveList.h b/pcsx2/gui/DriveList.h deleted file mode 100644 index 177f2c6444..0000000000 --- a/pcsx2/gui/DriveList.h +++ /dev/null @@ -1,60 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "AppCoreThread.h" - -class DriveListManager : public wxEvtHandler -{ -protected: - struct DriveListItem - { - wxString driveLetter; - wxMenuItem* itemPtr; - - DriveListItem() { itemPtr = NULL; } - - DriveListItem(const wxString& src) - : driveLetter(src) - { - itemPtr = NULL; - } - }; - - std::vector> m_Items; - wxMenu* m_Menu; - -public: - DriveListManager(wxMenu* menu); - virtual ~DriveListManager() = default; - - void RefreshList(); - -protected: - void ClearList(); - void OnChangedSelection(wxCommandEvent& evt); - void OnRefreshClicked(wxCommandEvent& evt); -}; - -struct DriveList -{ - wxMenu* Menu; - std::unique_ptr Manager; - - DriveList(); -}; - -extern wxWindowID SwapOrReset_Disc(wxWindow* owner, IScopedCoreThread& core, const wxString driveLetter); diff --git a/pcsx2/gui/EmbeddedImage.h b/pcsx2/gui/EmbeddedImage.h deleted file mode 100644 index fc390b2162..0000000000 --- a/pcsx2/gui/EmbeddedImage.h +++ /dev/null @@ -1,121 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include - -////////////////////////////////////////////////////////////////////////////////////////// -// Interface for loadable embedded images. See EmbeddedImage description for details. -// -class IEmbeddedImage -{ -public: - virtual const wxImage& Get() = 0; - virtual wxImage Scale(int width, int height) = 0; -}; - -////////////////////////////////////////////////////////////////////////////////////////// -// EmbeddedImage - Helper class for loading images which have been embedded into the binary -// manifest of the executable file. Images are only loaded when Get() is called, -// which allows this type to be passed to functions as a fallback or default action without -// incurring an unnecessary memory footprint. -// -// Note: Get() only loads the image once. All subsequent calls to Get will use the -// previously loaded image data. -// -template -class EmbeddedImage : public IEmbeddedImage -{ -protected: - wxImage m_Image; - const wxSize m_ResampleTo; - -protected: - // ------------------------------------------------------------------------ - // Internal function used to ensure the image is loaded before returning the image - // handle (called from all methods that return an image handle). - // - void _loadImage() - { - if (!m_Image.Ok()) - { - wxMemoryInputStream joe(ImageType::Data, ImageType::Length); - m_Image.LoadFile(joe, ImageType::GetFormat()); - - if (m_ResampleTo.IsFullySpecified() && (m_ResampleTo.GetWidth() != m_Image.GetWidth() || m_ResampleTo.GetHeight() != m_Image.GetHeight())) - m_Image.Rescale(m_ResampleTo.GetWidth(), m_ResampleTo.GetHeight(), wxIMAGE_QUALITY_HIGH); - } - } - -public: - EmbeddedImage() - : m_Image() - , m_ResampleTo(wxDefaultSize) - { - } - - // ------------------------------------------------------------------------ - // Constructor for creating an embedded image that gets resampled to the specified size when - // loaded. - // - // Implementation Note: This function uses wxWidgets ResamplBox method to resize the image. - // wxWidgets ResampleBicubic appears to be buggy and produces fairly poor results when down- - // sampling images (basically resembles a pixel resize). ResampleBox produces much cleaner - // results. - // - EmbeddedImage(int newWidth, int newHeight) - : m_Image() - , m_ResampleTo(newWidth, newHeight) - { - } - - // ------------------------------------------------------------------------ - // Loads and retrieves the embedded image. The embedded image is only loaded from its em- - // bedded format once. Any subsequent calls to Get(), Rescale(), or Resample() will use - // the pre-loaded copy. Translation: the png/jpeg decoding overhead happens only once, - // and only happens when the image is actually fetched. Simply creating an instance - // of an EmbeddedImage object uses no excess memory nor cpu overhead. :) - // - const wxImage& Get() - { - _loadImage(); - return m_Image; - } - - wxIcon GetIcon() - { - wxIcon retval; - retval.CopyFromBitmap(Get()); - return retval; - } - - // ------------------------------------------------------------------------ - // Performs a pixel resize of the loaded image and returns a new image handle (EmbeddedImage - // is left unmodified). - // - - wxImage Scale(int width, int height) - { - _loadImage(); - // Not strictly necessary - wxWidgets does the dimensions check anyway. - if (width != m_Image.GetWidth() || height != m_Image.GetHeight()) - return m_Image.Scale(width, height, wxIMAGE_QUALITY_HIGH); - else - return m_Image; - } -}; diff --git a/pcsx2/gui/ExecutorThread.cpp b/pcsx2/gui/ExecutorThread.cpp deleted file mode 100644 index e0de364c57..0000000000 --- a/pcsx2/gui/ExecutorThread.cpp +++ /dev/null @@ -1,514 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include - -using namespace pxSizerFlags; - -// -------------------------------------------------------------------------------------- -// ConsoleLogSource_Event (implementations) -// -------------------------------------------------------------------------------------- - -bool ConsoleLogSource_Event::Write( const pxEvtQueue* evtHandler, const SysExecEvent* evt, const wxChar* msg ) { - return _parent::Write("%s", (pxsFmt(L"(%s:%s) ", WX_STR(evtHandler->GetEventHandlerName()), WX_STR(evt->GetEventName())) + msg).ToUTF8().data() ); -} -bool ConsoleLogSource_Event::Warn( const pxEvtQueue* evtHandler, const SysExecEvent* evt, const wxChar* msg ) { - return _parent::Write("%s", (pxsFmt(L"(%s:%s) ", WX_STR(evtHandler->GetEventHandlerName()), WX_STR(evt->GetEventName())) + msg).ToUTF8().data() ); -} -bool ConsoleLogSource_Event::Error( const pxEvtQueue* evtHandler, const SysExecEvent* evt, const wxChar* msg ) { - return _parent::Write("%s", (pxsFmt(L"(%s:%s) ", WX_STR(evtHandler->GetEventHandlerName()), WX_STR(evt->GetEventName())) + msg).ToUTF8().data() ); -} - -ConsoleLogSource_Event::ConsoleLogSource_Event() -{ - static const TraceLogDescriptor myDesc = - { - "SysEvents", "S&ysVM Control Events", - "Logs events as they are passed to the PS2 virtual machine.", - }; - - m_Descriptor = &myDesc; -} - -ConsoleLogSource_Event pxConLog_Event; - -// -------------------------------------------------------------------------------------- -// SysExecEvent (implementations) -// -------------------------------------------------------------------------------------- -wxString SysExecEvent::GetEventName() const -{ - pxFail( "Warning: Unnamed SysExecutor Event! Please overload GetEventName() in all SysExecEvent derived classes." ); - return wxEmptyString; -} - -wxString SysExecEvent::GetEventMessage() const -{ - return GetEventName(); -} - -// This is called from _DoInvokeEvent after various affinity and state checks have verified the -// message as executable. Override this when possible. Only override _DoInvokeEvent if you -// need some kind of additional low-level ability. -void SysExecEvent::InvokeEvent() -{ -} - -// This is called by _DoInvokeEvent *always* -- even when exceptions occur during InvokeEvent(), -// making this function a bit like a C# 'finally' block (try/catch/finally -- a nice feature lacking -// from C++ prior to the new C++0x standard). -// -// This function calls PostResult by default, and should be invoked by derived classes overriding -// CleanupEvent(), unless you want to change the PostResult behavior. -void SysExecEvent::CleanupEvent() -{ - PostResult(); -} - -// Transports the specified exception to the thread/context that invoked this event. -// Events are run from a try/catch block in the event handler that automatically transports -// exceptions as neeeded, so there shouldn't be much need to use this method directly. -void SysExecEvent::SetException( BaseException* ex ) -{ - if( !ex ) return; - - ex->DiagMsg() += '('; - ex->DiagMsg() += StringUtil::wxStringToUTF8String(GetEventName()); - ex->DiagMsg() += ')'; - //ex->UserMsg() = prefix + ex->UserMsg(); - - if( m_sync ) - { - // Throws the exception inline with the message handler (this makes the exception - // look like it was thrown quite naturally). - m_sync->SetException( ex ); - } - else - { - // transport the exception to the main thread, since the message is fully - // asynchronous, or has already entered an asynchronous state. Message is sent - // as a non-blocking action since proper handling of user errors on async messages - // is *usually* to log/ignore it (hah), or to suspend emulation and issue a dialog - // box to the user. - - wxGetApp().PostEvent( pxExceptionEvent( ex ) ); - } -} - -void SysExecEvent::SetException( const BaseException& ex ) -{ - SetException( ex.Clone() ); -} - - -// This method calls _DoInvoke after performing some setup, exception handling, and -// affinity checks. For implementing behavior of your event, override _DoInvoke -// instead, which is the intended method of implementing derived class invocation. -void SysExecEvent::_DoInvokeEvent() -{ - AffinityAssert_AllowFrom_SysExecutor(); - - try { - InvokeEvent(); - } - catch( BaseException& ex ) - { - SetException( ex ); - } - catch( std::runtime_error& ex ) - { - SetException( new Exception::RuntimeError(ex) ); - } - - // Cleanup Execution -- performed regardless of exception or not above. - try { - CleanupEvent(); - } - catch( BaseException& ex ) - { - SetException( ex ); - } - catch( std::runtime_error& ex ) - { - SetException( new Exception::RuntimeError(ex) ); - } -} - -// Posts an empty result to the invoking context/thread of this message, if one exists. -// If the invoking thread posted the event in non-blocking fashion then no action is -// taken. -void SysExecEvent::PostResult() const -{ - if( m_sync ) m_sync->PostResult(); -} - -// -------------------------------------------------------------------------------------- -// pxEvtQueue Implementations -// -------------------------------------------------------------------------------------- -pxEvtQueue::pxEvtQueue() : - m_OwnerThreadId(), m_Quitting(false), m_qpc_Start(0) -{ -} - -// Puts the event queue into Shutdown mode, which does *not* immediately stop nor cancel -// the queue's processing. Instead it marks the queue inaccessible to all new events -// and continues procesing queued events for critical events that should not be ignored. -// (typically these are shutdown events critical to closing the app cleanly). Once -// all such events have been processed, the thread is stopped. -// -void pxEvtQueue::ShutdownQueue() -{ - if( m_Quitting ) return; - m_Quitting = true; - m_wakeup.Post(); -} - -struct ScopedThreadCancelDisable -{ - ScopedThreadCancelDisable() - { - int oldstate; - pthread_setcancelstate( PTHREAD_CANCEL_DISABLE, &oldstate ); - } - - ~ScopedThreadCancelDisable() - { - int oldstate; - pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &oldstate ); - } -}; - -// isIdle - parameter is useful for logging only (currently) -void pxEvtQueue::ProcessEvents( pxEvtList& list, bool isIdle ) -{ - ScopedLock synclock( m_mtx_pending ); - - pxEvtList::iterator node; - while( node = list.begin(), node != list.end() ) - { - std::unique_ptr deleteMe(*node); - - list.erase( node ); - if( !m_Quitting || deleteMe->IsCriticalEvent() ) - { - // Some messages can be blocking, so we should release the mutex lock while - // processing, to avoid having cases where the main thread deadlocks simply - // trying to add a message to the queue due to the basic mutex acquire needed. - - m_qpc_Start = GetCPUTicks(); - - synclock.Release(); - - pxEvtLog.Write( this, deleteMe.get(), wxsFormat(L"Executing... [%s]%s", - deleteMe->AllowCancelOnExit() ? L"Cancelable" : L"Noncancelable", isIdle ? L"(Idle)" : wxEmptyString).wc_str() - ); - - if( deleteMe->AllowCancelOnExit() ) - deleteMe->_DoInvokeEvent(); - else - { - ScopedThreadCancelDisable thr_cancel_scope; - deleteMe->_DoInvokeEvent(); - } - - u64 qpc_end = GetCPUTicks(); - pxEvtLog.Write( this, deleteMe.get(), wxsFormat(L"Event completed in %ums", - (u32)(((qpc_end-m_qpc_Start)*1000) / GetTickFrequency())).wc_str() - ); - - synclock.Acquire(); - m_qpc_Start = 0; // lets the main thread know the message completed. - } - else - { - pxEvtLog.Write( this, deleteMe.get(), L"Skipping Event: %s" ); - deleteMe->PostResult(); - } - } -} - -void pxEvtQueue::ProcessIdleEvents() -{ - ProcessEvents( m_idleEvents, true ); -} - -void pxEvtQueue::ProcessPendingEvents() -{ - ProcessEvents( m_pendingEvents ); -} - -// This method is provided for wxWidgets API conformance. I like to use PostEvent instead -// since it's reminiscent of PostMessage in Windows (and behaves rather similarly). -void pxEvtQueue::AddPendingEvent( SysExecEvent& evt ) -{ - PostEvent( evt ); -} - -// Adds an event to the event queue in non-blocking fashion. The thread executing this -// event queue will be woken up if it's idle/sleeping. -// IMPORTANT: The pointer version of this function will *DELETE* the event object passed -// to it automatically when the event has been executed. If you are using a scoped event -// you should use the Reference/Handle overload instead! -// -void pxEvtQueue::PostEvent( SysExecEvent* evt ) -{ - std::unique_ptr sevt(evt); - if( !sevt ) return; - - if( m_Quitting ) - { - sevt->PostResult(); - return; - } - - ScopedLock synclock( m_mtx_pending ); - - pxEvtLog.Write( this, evt, pxsFmt(L"Posting event! (pending=%d, idle=%d)", m_pendingEvents.size(), m_idleEvents.size()) ); - - m_pendingEvents.push_back( sevt.release() ); - if( m_pendingEvents.size() == 1) - m_wakeup.Post(); -} - -void pxEvtQueue::PostEvent( const SysExecEvent& evt ) -{ - PostEvent( evt.Clone() ); -} - -void pxEvtQueue::PostIdleEvent( SysExecEvent* evt ) -{ - if( !evt ) return; - - if( m_Quitting ) - { - evt->PostResult(); - return; - } - - ScopedLock synclock( m_mtx_pending ); - - pxEvtLog.Write( this, evt, pxsFmt(L"Posting event! (pending=%d, idle=%d) [idle]", m_pendingEvents.size(), m_idleEvents.size()) ); - - if( m_pendingEvents.empty() ) - { - m_pendingEvents.push_back( evt ); - m_wakeup.Post(); - } - else - m_idleEvents.push_back( evt ); -} - -void pxEvtQueue::PostIdleEvent( const SysExecEvent& evt ) -{ - PostIdleEvent( evt.Clone() ); -} - -void pxEvtQueue::ProcessEvent( SysExecEvent& evt ) -{ - if( wxThread::GetCurrentId() != m_OwnerThreadId ) - { - SynchronousActionState sync; - evt.SetSyncState( sync ); - PostEvent( evt ); - sync.WaitForResult(); - } - else - evt._DoInvokeEvent(); -} - -void pxEvtQueue::ProcessEvent( SysExecEvent* evt ) -{ - if( !evt ) return; - - if( wxThread::GetCurrentId() != m_OwnerThreadId ) - { - SynchronousActionState sync; - evt->SetSyncState( sync ); - PostEvent( evt ); - sync.WaitForResult(); - } - else - { - std::unique_ptr deleteMe(evt); - deleteMe->_DoInvokeEvent(); - } -} - -bool pxEvtQueue::Rpc_TryInvokeAsync( FnType_Void* method, const wxChar* traceName ) -{ - if( wxThread::GetCurrentId() != m_OwnerThreadId ) - { - PostEvent( new SysExecEvent_MethodVoid(method, traceName) ); - return true; - } - - return false; -} - -bool pxEvtQueue::Rpc_TryInvoke( FnType_Void* method, const wxChar* traceName ) -{ - if( wxThread::GetCurrentId() != m_OwnerThreadId ) - { - SynchronousActionState sync; - SysExecEvent_MethodVoid evt(method); - evt.Critical(); - evt.SetSyncState( sync ); - PostEvent( evt ); - sync.WaitForResult(); - - return true; - } - - return false; -} - -// This method invokes the derived class Idle implementations (if any) and then enters -// the sleep state until such time that new messages are received. -// -// Extending: Derived classes should override _DoIdle instead, unless it is necessary -// to implement post-wakeup behavior. -// -void pxEvtQueue::Idle() -{ - ProcessIdleEvents(); - _DoIdle(); - m_wakeup.WaitWithoutYield(); -} - -void pxEvtQueue::SetActiveThread() -{ - m_OwnerThreadId = wxThread::GetCurrentId(); -} - -// -------------------------------------------------------------------------------------- -// ExecutorThread Implementations -// -------------------------------------------------------------------------------------- -ExecutorThread::ExecutorThread(pxEvtQueue* evthandler) - : m_EvtHandler(evthandler) -{ -} - -bool ExecutorThread::IsRunning() const -{ - if( !m_EvtHandler ) return false; - return( !m_EvtHandler->IsShuttingDown() ); -} - -// Exposes the internal pxEvtQueue::ShutdownQueue API. See pxEvtQueue for details. -void ExecutorThread::ShutdownQueue() -{ - if( !m_EvtHandler ) return; - - if( !m_EvtHandler->IsShuttingDown() ) - m_EvtHandler->ShutdownQueue(); - - Block(); -} - -// Exposes the internal pxEvtQueue::PostEvent API. See pxEvtQueue for details. -void ExecutorThread::PostEvent( SysExecEvent* evt ) -{ - if( !pxAssert( m_EvtHandler ) ) { delete evt; return; } - m_EvtHandler->PostEvent( evt ); -} - -void ExecutorThread::PostEvent( const SysExecEvent& evt ) -{ - if( !pxAssert( m_EvtHandler ) ) return; - m_EvtHandler->PostEvent( evt ); -} - -// Exposes the internal pxEvtQueue::PostIdleEvent API. See pxEvtQueue for details. -void ExecutorThread::PostIdleEvent( SysExecEvent* evt ) -{ - if( !pxAssert( m_EvtHandler ) ) return; - m_EvtHandler->PostIdleEvent( evt ); -} - -void ExecutorThread::PostIdleEvent( const SysExecEvent& evt ) -{ - if( !pxAssert( m_EvtHandler ) ) return; - m_EvtHandler->PostIdleEvent( evt ); -} - -// Exposes the internal pxEvtQueue::ProcessEvent API. See pxEvtQueue for details. -void ExecutorThread::ProcessEvent( SysExecEvent* evt ) -{ - if( m_EvtHandler ) - m_EvtHandler->ProcessEvent( evt ); - else - { - std::unique_ptr deleteMe(evt); - deleteMe->_DoInvokeEvent(); - } -} - -void ExecutorThread::ProcessEvent( SysExecEvent& evt ) -{ - if( m_EvtHandler ) - m_EvtHandler->ProcessEvent( evt ); - else - evt._DoInvokeEvent(); -} - -void ExecutorThread::OnStart() -{ - //if( !m_ExecutorTimer ) - // m_ExecutorTimer = new wxTimer( wxTheApp, pxEvt_ThreadTaskTimeout_SysExec ); - - m_name = L"SysExecutor"; - _parent::OnStart(); -} - -void ExecutorThread::ExecuteTaskInThread() -{ - if( !pxAssertDev( m_EvtHandler, "Gimme a damn Event Handler first, object whore." ) ) return; - - m_EvtHandler->SetActiveThread(); - - while( true ) - { - if( !pxAssertDev( m_EvtHandler, "Event handler has been deallocated during SysExecutor thread execution." ) ) return; - - m_EvtHandler->Idle(); - m_EvtHandler->ProcessPendingEvents(); - if( m_EvtHandler->IsShuttingDown() ) break; - } -} - -void ExecutorThread::OnCleanupInThread() -{ - //wxGetApp().PostCommand( m_task, pxEvt_ThreadTaskComplete ); - _parent::OnCleanupInThread(); -} - -// -------------------------------------------------------------------------------------- -// Threaded Event Handlers (Pcsx2App) -// -------------------------------------------------------------------------------------- - -// This event is called when the SysExecutorThread's timer triggers, which means the -// VM/system task has taken an oddly long period of time to complete. The task is able -// to invoke a modal dialog from here that will grant the user some options for handling -// the unresponsive task. -void Pcsx2App::OnSysExecutorTaskTimeout( wxTimerEvent& evt ) -{ - if( !SysExecutorThread.IsRunning() ) return; - - //BaseThreadedInvocation* task = SysExecutorThread.GetTask(); - //if( !task ) return; - - //task->ShowModalStatus(); -} diff --git a/pcsx2/gui/FastFormatString.cpp b/pcsx2/gui/FastFormatString.cpp deleted file mode 100644 index 41ac313950..0000000000 --- a/pcsx2/gui/FastFormatString.cpp +++ /dev/null @@ -1,286 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "common/Pcsx2Defs.h" -#include "common/SafeArray.inl" -#include "gui/StringHelpers.h" -#include -#include - -// Implement some very commonly used SafeArray types here -// (done here for lack of a better place) - -template class SafeArray; -template class SafeArray; -template class SafeArray; - -template class SafeAlignedArray; -template class SafeAlignedArray; -template class SafeAlignedArray; - -// Sanity check: truncate strings if they exceed 512k in length. Anything like that -// is either a bug or really horrible code that needs to be stopped before it causes -// system deadlock. -static const int MaxFormattedStringLength = 0x80000; - -#ifndef __linux__ -static __ri void format_that_ascii_mess(CharBufferType& buffer, uint writepos, const char* fmt, va_list argptr) -#else -static void format_that_ascii_mess(CharBufferType& buffer, uint writepos, const char* fmt, va_list argptr) -#endif -{ - va_list args; - while (true) - { - int size = buffer.GetLength(); - - va_copy(args, argptr); - int len = vsnprintf(buffer.GetPtr(writepos), size - writepos, fmt, args); - va_end(args); - - // some implementations of vsnprintf() don't NUL terminate - // the string if there is not enough space for it so - // always do it manually - buffer[size - 1] = '\0'; - - if (size >= MaxFormattedStringLength) - break; - - // vsnprintf() may return either -1 (traditional Unix behavior) or the - // total number of characters which would have been written if the - // buffer were large enough (newer standards such as Unix98) - - if (len < 0) - len = size + (size / 4); - - len += writepos; - if (len < size) - break; - buffer.Resize(len + 128); - }; - - // performing an assertion or log of a truncated string is unsafe, so let's not; even - // though it'd be kinda nice if we did. -} - -// returns the length of the formatted string, in characters (wxChars). -#ifndef __linux__ -static __ri uint format_that_unicode_mess(CharBufferType& buffer, uint writepos, const wxChar* fmt, va_list argptr) -#else -static uint format_that_unicode_mess(CharBufferType& buffer, uint writepos, const wxChar* fmt, va_list argptr) -#endif -{ - va_list args; - while (true) - { - int size = buffer.GetLength() / sizeof(wxChar); - - va_copy(args, argptr); - int len = wxVsnprintf((wxChar*)buffer.GetPtr(writepos * sizeof(wxChar)), size - writepos, fmt, args); - va_end(args); - - // some implementations of vsnprintf() don't NUL terminate - // the string if there is not enough space for it so - // always do it manually - ((wxChar*)buffer.GetPtr())[size - 1] = L'\0'; - - if (size >= MaxFormattedStringLength) - return size - 1; - - // vsnprintf() may return either -1 (traditional Unix behavior) or the - // total number of characters which would have been written if the - // buffer were large enough (newer standards such as Unix98) - - if (len < 0) - len = size + (size / 4); - - len += writepos; - if (len < size) - return len; - buffer.Resize((len + 128) * sizeof(wxChar)); - }; - - // performing an assertion or log of a truncated string is unsafe, so let's not; even - // though it'd be kinda nice if we did. - - pxAssume(false); - return 0; // unreachable. -} - -// -------------------------------------------------------------------------------------- -// FastFormatUnicode (implementations) -// -------------------------------------------------------------------------------------- -// [TODO] This class should actually be renamed to FastFormatNative or FastFormatString, and -// adopted to properly support 1-byte wxChar types (mostly requiring some changes to the -// WriteV functions). The current implementation is fine for wx2.8, which always defaults -// to wide-varieties of wxChar -- but wx3.0 will use UTF8 for linux distros, which will break -// this class nicely in its current state. --air - -FastFormatUnicode::FastFormatUnicode() - : m_dest(2048) -{ - Clear(); -} - -void FastFormatUnicode::Clear() -{ - m_Length = 0; - ((wxChar*)m_dest.GetPtr())[0] = 0; -} - -FastFormatUnicode& FastFormatUnicode::WriteV(const char* fmt, va_list argptr) -{ - wxString converted(fromUTF8(FastFormatAscii().WriteV(fmt, argptr))); - - const uint inspos = m_Length; - const uint convLen = converted.Length(); - m_dest.MakeRoomFor((inspos + convLen + 64) * sizeof(wxChar)); - memcpy(&((wxChar*)m_dest.GetPtr())[inspos], converted.wc_str(), (convLen + 1) * sizeof(wxChar)); - m_Length += convLen; - - return *this; -} - -FastFormatUnicode& FastFormatUnicode::WriteV(const wxChar* fmt, va_list argptr) -{ - m_Length = format_that_unicode_mess(m_dest, m_Length, fmt, argptr); - return *this; -} - -FastFormatUnicode& FastFormatUnicode::Write(const char* fmt, ...) -{ - va_list list; - va_start(list, fmt); - WriteV(fmt, list); - va_end(list); - return *this; -} - -FastFormatUnicode& FastFormatUnicode::Write(const wxChar* fmt, ...) -{ - va_list list; - va_start(list, fmt); - WriteV(fmt, list); - va_end(list); - return *this; -} - -FastFormatUnicode& FastFormatUnicode::Write(const wxString fmt, ...) -{ - va_list list; - va_start(list, fmt); - WriteV(fmt.wx_str(), list); - va_end(list); - return *this; -} - -bool FastFormatUnicode::IsEmpty() const -{ - return ((wxChar&)m_dest[0]) == 0; -} - -FastFormatUnicode& FastFormatUnicode::ToUpper() -{ - wxChar* ch = (wxChar*)m_dest.GetPtr(); - for (uint i = 0; i < m_Length; ++i, ++ch) - *ch = (wxChar)wxToupper(*ch); - - return *this; -} - -FastFormatUnicode& FastFormatUnicode::ToLower() -{ - wxChar* ch = (wxChar*)m_dest.GetPtr(); - for (uint i = 0; i < m_Length; ++i, ++ch) - *ch = (wxChar)wxTolower(*ch); - - return *this; -} - -FastFormatUnicode& FastFormatUnicode::operator+=(const char* psz) -{ - Write(L"%s", WX_STR(fromUTF8(psz))); - return *this; -} - -wxString& operator+=(wxString& str1, const FastFormatUnicode& str2) -{ - str1.Append(str2.c_str(), str2.Length()); - return str1; -} - -wxString operator+(const wxString& str1, const FastFormatUnicode& str2) -{ - wxString s = str1; - s += str2; - return s; -} - -wxString operator+(const wxChar* str1, const FastFormatUnicode& str2) -{ - wxString s = str1; - s += str2; - return s; -} - -wxString operator+(const FastFormatUnicode& str1, const wxString& str2) -{ - wxString s = str1; - s += str2; - return s; -} - -wxString operator+(const FastFormatUnicode& str1, const wxChar* str2) -{ - wxString s = str1; - s += str2; - return s; -} - - -// -------------------------------------------------------------------------------------- -// FastFormatAscii (implementations) -// -------------------------------------------------------------------------------------- -FastFormatAscii::FastFormatAscii() - : m_dest(2048) -{ - Clear(); -} - -void FastFormatAscii::Clear() -{ - m_dest.GetPtr()[0] = 0; -} - -FastFormatAscii& FastFormatAscii::WriteV(const char* fmt, va_list argptr) -{ - format_that_ascii_mess(m_dest, strlen(m_dest.GetPtr()), fmt, argptr); - return *this; -} - -FastFormatAscii& FastFormatAscii::Write(const char* fmt, ...) -{ - va_list list; - va_start(list, fmt); - WriteV(fmt, list); - va_end(list); - return *this; -} - - -bool FastFormatAscii::IsEmpty() const -{ - return m_dest[0] == 0; -} diff --git a/pcsx2/gui/FileUtils.cpp b/pcsx2/gui/FileUtils.cpp deleted file mode 100644 index 7b873f5c8c..0000000000 --- a/pcsx2/gui/FileUtils.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "common/Path.h" -#include "wxDirName.h" - -#include -#include - -bool CopyDirectory( const wxString& from, const wxString& to ) { - wxDir src( from ); - if ( !src.IsOpened() ) { - return false; - } - - wxMkdir( to ); - wxDir dst( to ); - if ( !dst.IsOpened() ) { - return false; - } - - wxString filename; - - // copy directories - if ( src.GetFirst( &filename, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN ) ) { - do { - if ( !CopyDirectory( wxFileName( from, filename ).GetFullPath(), wxFileName( to, filename ).GetFullPath() ) ) { - return false; - } - } while ( src.GetNext( &filename ) ); - } - - // copy files - if ( src.GetFirst( &filename, wxEmptyString, wxDIR_FILES | wxDIR_HIDDEN ) ) { - do { - if ( !wxCopyFile( wxFileName( from, filename ).GetFullPath(), wxFileName( to, filename ).GetFullPath() ) ) { - return false; - } - } while ( src.GetNext( &filename ) ); - } - - return true; -} - -bool RemoveWxDirectory( const wxString& dirname ) { - { - wxDir dir( dirname ); - if ( !dir.IsOpened() ) { - return false; - } - - wxString filename; - - // delete subdirs recursively - if ( dir.GetFirst( &filename, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN ) ) { - do { - if ( !RemoveWxDirectory( wxFileName( dirname, filename ).GetFullPath() ) ) { - return false; - } - } while ( dir.GetNext( &filename ) ); - } - - // delete files - if ( dir.GetFirst( &filename, wxEmptyString, wxDIR_FILES | wxDIR_HIDDEN ) ) { - do { - if ( !wxRemoveFile( wxFileName( dirname, filename ).GetFullPath() ) ) { - return false; - } - } while ( dir.GetNext( &filename ) ); - } - } - - // oddly enough this has different results compared to the more sensible dirname.Rmdir(), don't change! - return wxFileName::Rmdir( dirname ); -} diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp deleted file mode 100644 index 22d7b0c26a..0000000000 --- a/pcsx2/gui/FrameForGS.cpp +++ /dev/null @@ -1,892 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "GSFrame.h" -#include "AppAccelerators.h" -#include "AppHost.h" -#include "AppSaveStates.h" -#include "Counters.h" -#include "GS.h" -#include "GS/GS.h" -#include "MainFrame.h" -#include "MSWstuff.h" -#include "PAD/Gamepad.h" -#include "PerformanceMetrics.h" -#include "common/StringUtil.h" - -#include "gui/Dialogs/ModalPopups.h" - -#include "ConsoleLogger.h" - -#include "Recording/InputRecording.h" -#include "Recording/Utilities/InputRecordingLogger.h" - -#include -#include -#include -#include -#include - -#ifdef __WXGTK__ -#include -#include - -// Junk X11 macros... -#ifdef DisableScreenSaver -#undef DisableScreenSaver -#endif -#endif - -#ifdef GDK_WINDOWING_WAYLAND -#include -#endif - -//#define GSWindowScaleDebug - -static const KeyAcceleratorCode FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL=KeyAcceleratorCode( WXK_RETURN ).Alt(); - -void GSPanel::InitDefaultAccelerators() -{ - // Note: these override GlobalAccels ( Pcsx2App::InitDefaultGlobalAccelerators() ) - // For plain letters or symbols, replace e.g. WXK_F1 with e.g. wxKeyCode('q') or wxKeyCode('-') - // For plain letter keys with shift, use e.g. AAC( wxKeyCode('q') ).Shift() and NOT wxKeyCode('Q') - // For a symbol with shift (e.g. '_' which is '-' with shift) use AAC( wxKeyCode('-') ).Shift() - - typedef KeyAcceleratorCode AAC; - - if (!m_Accels) m_Accels = std::unique_ptr(new AcceleratorDictionary); - - m_Accels->Map( AAC( WXK_F1 ), "States_FreezeCurrentSlot" ); - m_Accels->Map( AAC( WXK_F3 ), "States_DefrostCurrentSlot"); - m_Accels->Map( AAC( WXK_F3 ).Shift(), "States_DefrostCurrentSlotBackup"); - m_Accels->Map( AAC( WXK_F2 ), "States_CycleSlotForward" ); - m_Accels->Map( AAC( WXK_F2 ).Shift(), "States_CycleSlotBackward" ); - - m_Accels->Map( AAC( WXK_F4 ), "Framelimiter_MasterToggle"); - m_Accels->Map( AAC( WXK_TAB ), "Framelimiter_TurboToggle" ); - m_Accels->Map( AAC( WXK_TAB ).Shift(), "Framelimiter_SlomoToggle" ); - - m_Accels->Map( AAC( WXK_F6 ), "GSwindow_CycleAspectRatio" ); - - m_Accels->Map( AAC( WXK_NUMPAD_ADD ).Cmd().Alt(), "GSwindow_ZoomInY" ); //CTRL on Windows/linux, CMD on OSX - m_Accels->Map( AAC( WXK_NUMPAD_SUBTRACT ).Cmd().Alt(), "GSwindow_ZoomOutY" ); - m_Accels->Map( AAC( WXK_NUMPAD_MULTIPLY ).Cmd().Alt(), "GSwindow_ZoomResetY" ); - - m_Accels->Map( AAC( WXK_ESCAPE ), "Sys_SuspendResume" ); - m_Accels->Map( AAC( WXK_F8 ), "Sys_TakeSnapshot" ); // also shift and ctrl-shift will be added automatically - m_Accels->Map( AAC( WXK_F9 ), "Sys_RenderswitchToggle"); - - m_Accels->Map( AAC( WXK_F10 ), "Sys_LoggingToggle" ); - // m_Accels->Map( AAC( WXK_F11 ), "Sys_FreezeGS" ); - m_Accels->Map( AAC( WXK_F12 ), "Sys_RecordingToggle" ); - - m_Accels->Map( FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL, "FullscreenToggle" ); -} - -wxString GSPanel::GetAssociatedKeyCode(const char* id) -{ - return m_Accels->findKeycodeWithCommandId(id).toTitleizedString(); -} - -GSPanel::GSPanel( wxWindow* parent ) - : wxWindow() - , m_HideMouseTimer( this ) - , m_coreRunning(false) -{ - m_CursorShown = true; - m_HasFocus = false; - - if ( !wxWindow::Create(parent, wxID_ANY) ) - throw Exception::RuntimeError().SetDiagMsg( "GSPanel constructor explode!!" ); - - SetName( L"GSPanel" ); - - InitDefaultAccelerators(); - - SetBackgroundColour(wxColour((unsigned long)0)); - if( g_Conf->GSWindow.AlwaysHideMouse ) - { - SetCursor( wxCursor(wxCURSOR_BLANK) ); - m_CursorShown = false; - } - - Bind(wxEVT_SIZE, &GSPanel::OnResize, this); -#if wxCHECK_VERSION(3, 1, 3) - Bind(wxEVT_DPI_CHANGED, &GSPanel::OnResize, this); -#endif - Bind(wxEVT_KEY_UP, &GSPanel::OnKeyDownOrUp, this); - Bind(wxEVT_KEY_DOWN, &GSPanel::OnKeyDownOrUp, this); - - Bind(wxEVT_SET_FOCUS, &GSPanel::OnFocus, this); - Bind(wxEVT_KILL_FOCUS, &GSPanel::OnFocusLost, this); - - Bind(wxEVT_TIMER, &GSPanel::OnHideMouseTimeout, this, m_HideMouseTimer.GetId()); - - // Any and all events which should result in the mouse cursor being made visible - // are connected here. If I missed one, feel free to add it in! --air - Bind(wxEVT_LEFT_DOWN, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_LEFT_UP, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_MIDDLE_DOWN, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_MIDDLE_UP, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_RIGHT_DOWN, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_RIGHT_UP, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_MOTION, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_LEFT_DCLICK, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_MIDDLE_DCLICK, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_RIGHT_DCLICK, &GSPanel::OnMouseEvent, this); - Bind(wxEVT_MOUSEWHEEL, &GSPanel::OnMouseEvent, this); - - Bind(wxEVT_LEFT_DCLICK, &GSPanel::OnLeftDclick, this); -} - -GSPanel::~GSPanel() -{ - //CoreThread.Suspend( false ); // Just in case...! - -#ifdef WAYLAND_API - WaylandDestroySubsurface(); -#endif -} - -void GSPanel::DoShowMouse() -{ - if( g_Conf->GSWindow.AlwaysHideMouse ) return; - - if( !m_CursorShown ) - { - SetCursor( wxCursor( wxCURSOR_DEFAULT ) ); - m_CursorShown = true; - } - m_HideMouseTimer.Start( 1750, true ); -} - -#ifdef _WIN32 -static float GetDpiScaleForWxWindow(wxWindow* window) -{ - static UINT(WINAPI * get_dpi_for_window)(HWND hwnd); - if (!get_dpi_for_window) - { - HMODULE mod = GetModuleHandle(L"user32.dll"); - if (mod) - get_dpi_for_window = reinterpret_cast(GetProcAddress(mod, "GetDpiForWindow")); - } - if (!get_dpi_for_window) - return 1.0f; - - // less than 100% scaling seems unlikely. - const UINT dpi = get_dpi_for_window(window->GetHandle()); - return (dpi > 0) ? std::max(1.0f, static_cast(dpi) / 96.0f) : 1.0f; -} -#endif - -std::optional GSPanel::GetWindowInfo() -{ - WindowInfo ret; - - const wxSize gs_vp_size(GetClientSize()); - ret.surface_scale = static_cast(GetContentScaleFactor()); - ret.surface_width = static_cast(gs_vp_size.GetWidth()); - ret.surface_height = static_cast(gs_vp_size.GetHeight()); - -#if defined(_WIN32) - ret.type = WindowInfo::Type::Win32; - ret.window_handle = GetHandle(); - - // Windows DPI internally uses the higher pixel count, so work out by how much. - ret.surface_scale = GetDpiScaleForWxWindow(this); -#elif defined(__WXGTK__) - GtkWidget* child_window = GTK_WIDGET(GetHandle()); - - // create the widget to allow to use GDK_WINDOW_* macro - gtk_widget_realize(child_window); - - // Disable the widget double buffer, you will use the opengl one - gtk_widget_set_double_buffered(child_window, false); - - GdkWindow* draw_window = gtk_widget_get_window(child_window); - - // TODO: Do we even want to support GTK2? -#if GTK_MAJOR_VERSION < 3 - ret.type = WindowInfo::Type::X11; - ret.display_connection = GDK_WINDOW_XDISPLAY(draw_window); - ret.window_handle = reinterpret_cast(GDK_WINDOW_XWINDOW(draw_window)); -#else -#ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_WINDOW(draw_window)) - { - ret.type = WindowInfo::Type::X11; - ret.display_connection = GDK_WINDOW_XDISPLAY(draw_window); - ret.window_handle = reinterpret_cast(GDK_WINDOW_XID(draw_window)); - - // GTK/X11 seems to not scale coordinates? - ret.surface_width = static_cast(ret.surface_width * ret.surface_scale); - ret.surface_height = static_cast(ret.surface_height * ret.surface_scale); - } -#endif // GDK_WINDOWING_X11 -#if defined(GDK_WINDOWING_WAYLAND) && defined(WAYLAND_API) - if (GDK_IS_WAYLAND_WINDOW(draw_window)) - { - wl_display* display = gdk_wayland_display_get_wl_display(gdk_window_get_display(draw_window)); - wl_surface* parent_surface = gdk_wayland_window_get_wl_surface(draw_window); - if (!m_wl_child_surface && !WaylandCreateSubsurface(display, parent_surface)) - return std::nullopt; - - ret.type = WindowInfo::Type::Wayland; - ret.display_connection = display; - ret.window_handle = m_wl_child_surface; - } -#endif // GDK_WINDOWING_WAYLAND -#endif // GTK_MAJOR_VERSION >= 3 -#elif defined(__WXOSX__) - ret.type = WindowInfo::Type::MacOS; - ret.surface_width = static_cast(ret.surface_width * ret.surface_scale); - ret.surface_height = static_cast(ret.surface_height * ret.surface_scale); - ret.window_handle = GetHandle(); -#endif - - if (ret.type == WindowInfo::Type::Surfaceless) - { - Console.Error("Unknown window type for GSFrame."); - return std::nullopt; - } - - return ret; -} - -void GSPanel::OnResize(wxEvent& event) -{ - if( IsBeingDeleted() ) return; - event.Skip(); - - if (g_gs_window_info.type == WindowInfo::Type::Surfaceless) - return; - - const wxSize gs_vp_size(GetClientSize()); -#ifdef _WIN32 - const float scale = GetDpiScaleForWxWindow(this); -#else - const float scale = GetContentScaleFactor(); -#endif - int width = gs_vp_size.GetWidth(); - int height = gs_vp_size.GetHeight(); - - if (false -#ifdef __WXGTK__ - || g_gs_window_info.type == WindowInfo::Type::X11 -#endif -#ifdef __APPLE__ - || g_gs_window_info.type == WindowInfo::Type::MacOS -#endif - ) - { - width = static_cast(width * scale); - height = static_cast(height * scale); - } - - g_gs_window_info.surface_width = width; - g_gs_window_info.surface_height = height; - g_gs_window_info.surface_scale = scale; - - Host::GSWindowResized(width, height, scale); -} - -void GSPanel::OnMouseEvent( wxMouseEvent& evt ) -{ - if( IsBeingDeleted() ) return; - - // Do nothing for left-button event - if (!evt.Button(wxMOUSE_BTN_LEFT)) { - evt.Skip(); - DoShowMouse(); - } - -#if defined(__unix__) || defined(__APPLE__) - // HACK2: In gsopen2 there is one event buffer read by both wx/gui and pad. Wx deletes - // the event before the pad see it. So you send key event directly to the pad. - HostKeyEvent event; - // FIXME how to handle double click ??? - if (evt.ButtonDown()) - { - event.type = HostKeyEvent::Type::MousePressed; - event.key = evt.GetButton() | 0x10000; - } - else if (evt.ButtonUp()) - { - event.type = HostKeyEvent::Type::MouseReleased; - event.key = evt.GetButton() | 0x10000; - } - else if (evt.Moving() || evt.Dragging()) - { - event.type = HostKeyEvent::Type::MouseMove; - long x, y; - evt.GetPosition(&x, &y); - - wxCoord w, h; - wxWindowDC dc(this); - dc.GetSize(&w, &h); - - // Special case to allow continuous mouvement near the border - if (x < 10) - x = 0; - else if (x > (w - 10)) - x = 0xFFFF; - - if (y < 10) - y = 0; - else if (y > (w - 10)) - y = 0xFFFF; - - // For compatibility purpose with the existing structure. I decide to reduce - // the position to 16 bits. - event.key = ((y & 0xFFFF) << 16) | (x & 0xFFFF); - } - else - { - event.key = 0; - event.type = HostKeyEvent::Type::NoEvent; - } - - PADWriteEvent(event); -#endif -} - -void GSPanel::OnHideMouseTimeout( wxTimerEvent& evt ) -{ - if( IsBeingDeleted() || !m_HasFocus ) return; - if( CoreThread.GetExecutionMode() != SysThreadBase::ExecMode_Opened ) return; - - SetCursor( wxCursor( wxCURSOR_BLANK ) ); - m_CursorShown = false; -} - -void GSPanel::OnKeyDownOrUp( wxKeyEvent& evt ) -{ - - // HACK: PAD expect PCSX2 to ignore keyboard messages on the GS Window while - // it is open, so ignore here (PCSX2 will direct messages routed from PAD directly - // to the APP level message handler, which in turn routes them right back here -- yes it's - // silly, but oh well). - -#if defined(__unix__) || defined(__APPLE__) - // HACK2: In gsopen2 there is one event buffer read by both wx/gui and pad. Wx deletes - // the event before the pad see it. So you send key event directly to the pad. - HostKeyEvent event; - event.key = evt.GetRawKeyCode(); - if (evt.GetEventType() == wxEVT_KEY_UP) - event.type = HostKeyEvent::Type::KeyReleased; - else if (evt.GetEventType() == wxEVT_KEY_DOWN) - event.type = HostKeyEvent::Type::KeyPressed; - else - event.type = HostKeyEvent::Type::NoEvent; - - PADWriteEvent(event); -#endif - -#ifdef __WXMSW__ - // Not sure what happens on Linux, but on windows this method is called only when emulation - // is paused and the GS window is not hidden (and therefore the event doesn't arrive from - // pad and doesn't go through Pcsx2App::PadKeyDispatch). On such case (paused). - // It needs to handle two issues: - // 1. It's called both for key down and key up (linux apparently needs it this way) - but we - // don't want to execute the command twice (normally commands execute on key down only). - // 2. It has wx keycode which is upper case for ascii chars, but our command handlers expect - // lower case for non-special keys. - - // ignore key up events - if (evt.GetEventType() == wxEVT_KEY_UP) - return; - - // Make ascii keys lower case - this apparently works correctly also with modifiers (shift included) - if (evt.m_keyCode >= 'A' && evt.m_keyCode <= 'Z') - evt.m_keyCode += (int)'a' - 'A'; -#endif - - if (CoreThread.IsOpen()) - { - return; - } - - DirectKeyCommand( evt ); -} - -void GSPanel::DirectKeyCommand( const KeyAcceleratorCode& kac ) -{ - const GlobalCommandDescriptor* cmd = NULL; - - std::unordered_map::const_iterator iter(m_Accels->find(kac.val32)); - if (iter == m_Accels->end()) - return; - - cmd = iter->second; - - DbgCon.WriteLn( "(gsFrame) Invoking command: %s", cmd->Id ); - cmd->Invoke(); - - if( cmd->AlsoApplyToGui && !g_ConfigPanelChanged) - AppApplySettings(); -} - -void GSPanel::DirectKeyCommand( wxKeyEvent& evt ) -{ - DirectKeyCommand(KeyAcceleratorCode( evt )); -} - -void GSPanel::UpdateScreensaver() -{ - const bool prevent = g_Conf->GSWindow.DisableScreenSaver && m_HasFocus && m_coreRunning; - WindowInfo::InhibitScreensaver(g_gs_window_info, prevent); -} - -void GSPanel::OnFocus( wxFocusEvent& evt ) -{ - evt.Skip(); - m_HasFocus = true; - - if( g_Conf->GSWindow.AlwaysHideMouse ) - { - SetCursor( wxCursor(wxCURSOR_BLANK) ); - m_CursorShown = false; - } - else - DoShowMouse(); - -#if defined(__unix__) || defined(__APPLE__) - // HACK2: In gsopen2 there is one event buffer read by both wx/gui and pad. Wx deletes - // the event before the pad see it. So you send key event directly to the pad. - HostKeyEvent event = {HostKeyEvent::Type::FocusGained, 0}; - PADWriteEvent(event); -#endif - //Console.Warning("GS frame > focus set"); - - UpdateScreensaver(); -} - -void GSPanel::OnFocusLost( wxFocusEvent& evt ) -{ - evt.Skip(); - m_HasFocus = false; - DoShowMouse(); -#if defined(__unix__) || defined(__APPLE__) - // HACK2: In gsopen2 there is one event buffer read by both wx/gui and pad. Wx deletes - // the event before the pad see it. So you send key event directly to the pad. - HostKeyEvent event = {HostKeyEvent::Type::FocustLost, 0}; - PADWriteEvent(event); -#endif - //Console.Warning("GS frame > focus lost"); - - UpdateScreensaver(); -} - -void GSPanel::CoreThread_OnResumed() -{ - m_coreRunning = true; - UpdateScreensaver(); -} - -void GSPanel::CoreThread_OnSuspended() -{ - m_coreRunning = false; - UpdateScreensaver(); -} - -void GSPanel::AppStatusEvent_OnSettingsApplied() -{ - if( IsBeingDeleted() ) return; - DoShowMouse(); -} - -void GSPanel::OnLeftDclick(wxMouseEvent& evt) -{ - if( !g_Conf->GSWindow.IsToggleFullscreenOnDoubleClick ) - return; - - //Console.WriteLn("GSPanel::OnDoubleClick: Invoking Fullscreen-Toggle accelerator."); - DirectKeyCommand(FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL); -} - -#if defined(__WXGTK__) && defined(GDK_WINDOWING_WAYLAND) && defined(WAYLAND_API) - -void GSPanel::WaylandGlobalRegistryAddHandler(void* data, wl_registry* registry, uint32_t id, const char* interface, uint32_t version) -{ - GSPanel* pnl = static_cast(data); - if (std::strcmp(interface, wl_compositor_interface.name) == 0) - { - pnl->m_wl_compositor = static_cast(wl_registry_bind(registry, id, &wl_compositor_interface, wl_compositor_interface.version)); - } - else if (std::strcmp(interface, wl_subcompositor_interface.name) == 0) - { - pnl->m_wl_subcompositor = static_cast(wl_registry_bind(registry, id, &wl_subcompositor_interface, wl_subcompositor_interface.version)); - } -} - -void GSPanel::WaylandGlobalRegistryRemoveHandler(void* data, wl_registry* registry, uint32_t id) -{ -} - -bool GSPanel::WaylandCreateSubsurface(wl_display* display, wl_surface* surface) -{ - static constexpr wl_registry_listener registry_listener = { - &GSPanel::WaylandGlobalRegistryAddHandler, - &GSPanel::WaylandGlobalRegistryRemoveHandler}; - - wl_registry* registry = wl_display_get_registry(display); - wl_registry_add_listener(registry, ®istry_listener, this); - wl_display_flush(display); - wl_display_roundtrip(display); - if (!m_wl_compositor || !m_wl_subcompositor) - { - Console.Error("Missing wl_compositor or wl_subcompositor"); - return false; - } - - wl_registry_destroy(registry); - - m_wl_child_surface = wl_compositor_create_surface(m_wl_compositor); - if (!m_wl_child_surface) - { - Console.Error("Failed to create compositor surface"); - return false; - } - - wl_region* input_region = wl_compositor_create_region(m_wl_compositor); - if (!input_region) - { - Console.Error("Failed to create input region"); - return false; - } - wl_surface_set_input_region(m_wl_child_surface, input_region); - wl_region_destroy(input_region); - - m_wl_child_subsurface = wl_subcompositor_get_subsurface(m_wl_subcompositor, m_wl_child_surface, surface); - if (!m_wl_child_subsurface) - { - Console.Error("Failed to create subsurface"); - return false; - } - - // we want to present asynchronously to the surrounding window - wl_subsurface_set_desync(m_wl_child_subsurface); - return true; -} - -void GSPanel::WaylandDestroySubsurface() -{ - if (m_wl_child_subsurface) - { - wl_subsurface_destroy(m_wl_child_subsurface); - m_wl_child_subsurface = nullptr; - } - - if (m_wl_child_surface) - { - wl_surface_destroy(m_wl_child_surface); - m_wl_child_surface = nullptr; - } - - if (m_wl_subcompositor) - { - wl_subcompositor_destroy(m_wl_subcompositor); - m_wl_subcompositor = nullptr; - } - - if (m_wl_compositor) - { - wl_compositor_destroy(m_wl_compositor); - m_wl_compositor = nullptr; - } -} - -#endif - - -// -------------------------------------------------------------------------------------- -// GSFrame Implementation -// -------------------------------------------------------------------------------------- - -static const uint TitleBarUpdateMs = 333; -static const uint TitleBarUpdateMsWhenRecording = 50; - -GSFrame::GSFrame( const wxString& title) - : wxFrame(NULL, wxID_ANY, title, g_Conf->GSWindow.WindowPos) - , m_timer_UpdateTitle( this ) -{ - SetIcons( wxGetApp().GetIconBundle() ); - SetBackgroundColour( *wxBLACK ); - - AppStatusEvent_OnSettingsApplied(); - - GSPanel* gsPanel = new GSPanel( this ); - m_id_gspanel = gsPanel->GetId(); - gsPanel->SetPosition(wxPoint(0, 0)); - gsPanel->SetSize(GetClientSize()); - - // TODO -- Implement this GS window status window! Whee. - // (main concern is retaining proper client window sizes when closing/re-opening the window). - //m_statusbar = CreateStatusBar( 2 ); - - Bind(wxEVT_CLOSE_WINDOW, &GSFrame::OnCloseWindow, this); - Bind(wxEVT_MOVE, &GSFrame::OnMove, this); - Bind(wxEVT_SIZE, &GSFrame::OnResize, this); - Bind(wxEVT_SET_FOCUS, &GSFrame::OnFocus, this); - - Bind(wxEVT_TIMER, &GSFrame::OnUpdateTitle, this, m_timer_UpdateTitle.GetId()); -} - -void GSFrame::OnCloseWindow(wxCloseEvent& evt) -{ - // if a gs dump is running, it cleans up the window once it's hidden. - if (GSDump::isRunning) - { - Hide(); - return; - } - - // but under normal operation, we want to suspend the core thread, which will hide us - // (except if hide-on-escape is enabled, in which case we want to force hide ourself) - sApp.OnGsFrameClosed( GetId() ); - if (!IsShown()) - Hide(); -} - -void GSFrame::OnDestroyWindow(wxWindowDestroyEvent& evt) -{ - sApp.OnGsFrameDestroyed(GetId()); - evt.Skip(); -} - -bool GSFrame::ShowFullScreen(bool show, bool updateConfig) -{ - /*if( show != IsFullScreen() ) - Console.WriteLn( Color_StrongMagenta, "(gsFrame) Switching to %s mode...", show ? "Fullscreen" : "Windowed" );*/ - - if (updateConfig && g_Conf->GSWindow.IsFullscreen != show) - { - g_Conf->GSWindow.IsFullscreen = show; - wxGetApp().PostIdleMethod( AppSaveSettings ); - } - - // IMPORTANT! On MSW platforms you must ALWAYS show the window prior to calling - // ShowFullscreen(), otherwise the window will be oddly unstable (lacking input and unable - // to properly flip back into fullscreen mode after alt-enter). I don't know if that - // also happens on Linux. - - if( !IsShown() ) Show(); - - uint flags = wxFULLSCREEN_ALL; -#ifdef _WIN32 - flags |= g_Conf->GSWindow.EnableVsyncWindowFlag ? WS_POPUP : 0; -#endif - bool retval = _parent::ShowFullScreen( show, flags ); - - return retval; -} - -void GSFrame::UpdateTitleUpdateFreq() -{ - if (g_Conf->EmuOptions.EnableRecordingTools) - { - m_timer_UpdateTitle.Start(TitleBarUpdateMsWhenRecording); - } - else - { - m_timer_UpdateTitle.Start(TitleBarUpdateMs); - } -} - -void GSFrame::CoreThread_OnResumed() -{ - UpdateTitleUpdateFreq(); - if (!IsShown()) - { - Show(); - } -} - -void GSFrame::CoreThread_OnSuspended() -{ - if( !IsBeingDeleted() && g_Conf->GSWindow.CloseOnEsc ) Hide(); -} - -void GSFrame::CoreThread_OnStopped() -{ - //if( !IsBeingDeleted() ) Destroy(); -} - -// overrides base Show behavior. -bool GSFrame::Show( bool shown ) -{ - if( shown ) - { - GSPanel* gsPanel = GetViewport(); - - if( !gsPanel || gsPanel->IsBeingDeleted() ) - { - gsPanel = new GSPanel( this ); - m_id_gspanel = gsPanel->GetId(); - } - - gsPanel->SetFocus(); - - if (!m_timer_UpdateTitle.IsRunning()) - { - if (g_Conf->EmuOptions.EnableRecordingTools) - { - m_timer_UpdateTitle.Start(TitleBarUpdateMsWhenRecording); - } - else - { - m_timer_UpdateTitle.Start(TitleBarUpdateMs); - } - } - } - else - { - m_timer_UpdateTitle.Stop(); - } - - return _parent::Show( shown ); -} - -void GSFrame::AppStatusEvent_OnSettingsApplied() -{ - if( IsBeingDeleted() ) return; - - SetWindowStyle((g_Conf->GSWindow.DisableResizeBorders ? 0 : wxRESIZE_BORDER) | wxCAPTION | wxCLIP_CHILDREN | - wxSYSTEM_MENU | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxCLOSE_BOX); - if (!IsFullScreen() && !IsMaximized()) - SetClientSize(g_Conf->GSWindow.WindowSize); - Refresh(); -} - -GSPanel* GSFrame::GetViewport() -{ - return (GSPanel*)FindWindowById( m_id_gspanel ); -} - -void GSFrame::OnUpdateTitle( wxTimerEvent& evt ) -{ - // Update the title only after the completion of at least a single Vsync, it's pointless to display the fps - // when there are have been no frames rendered and SMODE2 register seems to fresh start with 0 on all the bitfields which - // leads to the value of INT bit as 0 initially and the games are mentioned as progressive which is a bit misleading, - // to prevent such issues, let's update the title after the actual frame rendering starts. - if (g_FrameCount == 0) - return; - - FastFormatUnicode cpuUsage; - if (!IsFullScreen()) { - cpuUsage.Write(L"EE: %3.0f%%", PerformanceMetrics::GetCPUThreadUsage()); - cpuUsage.Write(L" | GS: %3.0f%%", PerformanceMetrics::GetGSThreadUsage()); - - if (THREAD_VU1) - cpuUsage.Write(L" | VU: %3.0f%%", PerformanceMetrics::GetVUThreadUsage()); - } - -#ifdef __linux__ - // Important Linux note: When the title is set in fullscreen the window is redrawn. Unfortunately - // an intermediate white screen appears too which leads to a very annoying flickering. - if (IsFullScreen()) return; -#endif - - AppConfig::UiTemplateOptions& templates = g_Conf->Templates; - - wxString limiterStr = templates.LimiterUnlimited; - - if( g_Conf->EmuOptions.GS.FrameLimitEnable ) - { - switch( EmuConfig.LimiterMode ) - { - case LimiterModeType::Nominal: limiterStr = templates.LimiterNormal; break; - case LimiterModeType::Turbo: limiterStr = templates.LimiterTurbo; break; - case LimiterModeType::Slomo: limiterStr = templates.LimiterSlowmo; break; - case LimiterModeType::Unlimited: limiterStr = templates.LimiterUnlimited; break; - } - } - - const u64& smode2 = *(u64*)PS2GS_BASE(GS_SMODE2); - wxString omodef = (smode2 & 2) ? templates.OutputFrame : templates.OutputField; - wxString omodei = (smode2 & 1) ? templates.OutputInterlaced : templates.OutputProgressive; - wxString title = templates.TitleTemplate; - - std::string gsStats; - GSgetTitleStats(gsStats); - - title.Replace(L"${slot}", pxsFmt(L"%d", States_GetCurrentSlot())); - title.Replace(L"${limiter}", limiterStr); - title.Replace(L"${speed}", pxsFmt(L"%3d%%", lround(PerformanceMetrics::GetSpeed()))); - title.Replace(L"${vfps}", pxsFmt(L"%.02f", PerformanceMetrics::GetFPS())); - title.Replace(L"${cpuusage}", cpuUsage); - title.Replace(L"${omodef}", omodef); - title.Replace(L"${omodei}", omodei); - title.Replace(L"${gs}", StringUtil::UTF8StringToWxString(gsStats)); - title.Replace(L"${videomode}", ReportVideoMode()); - if (CoreThread.IsPaused() && !GSDump::isRunning) - title = templates.Paused + title; - - SetTitle(title); -} - -void GSFrame::OnFocus( wxFocusEvent& evt ) -{ - if( IsBeingDeleted() ) return; - - evt.Skip(false); // Reject the focus message, as we pass focus to the child - if( wxWindow* gsPanel = GetViewport() ) gsPanel->SetFocus(); -} - -void GSFrame::OnMove( wxMoveEvent& evt ) -{ - if( IsBeingDeleted() ) return; - - evt.Skip(); - - g_Conf->GSWindow.IsMaximized = IsMaximized(); - - // evt.GetPosition() returns the client area position, not the window frame position. - if( !g_Conf->GSWindow.IsMaximized && !IsFullScreen() && !IsIconized() && IsVisible() ) - g_Conf->GSWindow.WindowPos = GetScreenPosition(); - - // wxGTK note: X sends gratuitous amounts of OnMove messages for various crap actions - // like selecting or deselecting a window, which muck up docking logic. We filter them - // out using 'lastpos' here. :) - - //static wxPoint lastpos( wxDefaultCoord, wxDefaultCoord ); - //if( lastpos == evt.GetPosition() ) return; - //lastpos = evt.GetPosition(); -} - -void GSFrame::SetFocus() -{ - _parent::SetFocus(); - if( GSPanel* gsPanel = GetViewport() ) - gsPanel->SetFocusFromKbd(); -} - -void GSFrame::OnResize( wxSizeEvent& evt ) -{ - if( IsBeingDeleted() ) return; - - if( !IsFullScreen() && !IsMaximized() && IsVisible() ) - { - g_Conf->GSWindow.WindowSize = GetClientSize(); - } - - // Ensure we're always in sync with the parent size. - if( GSPanel* gsPanel = GetViewport() ) - gsPanel->SetSize(evt.GetSize()); - - evt.Skip(); -} diff --git a/pcsx2/gui/GSFrame.h b/pcsx2/gui/GSFrame.h deleted file mode 100644 index 0166adf7f1..0000000000 --- a/pcsx2/gui/GSFrame.h +++ /dev/null @@ -1,138 +0,0 @@ - -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "AppCommon.h" -#include "common/WindowInfo.h" -#include -#include - -#ifdef WAYLAND_API -#include -#endif - -// -------------------------------------------------------------------------------------- -// GSPanel -// -------------------------------------------------------------------------------------- -class GSPanel : public wxWindow - , public EventListener_AppStatus - , public EventListener_CoreThread -{ - typedef wxWindow _parent; - -protected: - std::unique_ptr m_Accels; - - wxTimer m_HideMouseTimer; - bool m_CursorShown; - bool m_HasFocus; - bool m_coreRunning; - -public: - GSPanel( wxWindow* parent ); - virtual ~GSPanel(); - - std::optional GetWindowInfo(); - - void DoShowMouse(); - void DirectKeyCommand( wxKeyEvent& evt ); - void DirectKeyCommand( const KeyAcceleratorCode& kac ); - void InitDefaultAccelerators(); - wxString GetAssociatedKeyCode(const char* id); - -protected: - void AppStatusEvent_OnSettingsApplied(); - - void OnResize(wxEvent& event); - void OnMouseEvent( wxMouseEvent& evt ); - void OnHideMouseTimeout( wxTimerEvent& evt ); - void OnKeyDownOrUp( wxKeyEvent& evt ); - void OnFocus( wxFocusEvent& evt ); - void OnFocusLost( wxFocusEvent& evt ); - void CoreThread_OnResumed(); - void CoreThread_OnSuspended(); - - void OnLeftDclick( wxMouseEvent& evt ); - - void UpdateScreensaver(); - -private: -#ifdef WAYLAND_API - static void WaylandGlobalRegistryAddHandler(void* data, wl_registry* registry, uint32_t id, const char* interface, uint32_t version); - static void WaylandGlobalRegistryRemoveHandler(void* data, wl_registry* registry, uint32_t id); - - bool WaylandCreateSubsurface(wl_display* display, wl_surface* parent_surface); - void WaylandDestroySubsurface(); - - wl_compositor* m_wl_compositor = nullptr; - wl_subcompositor* m_wl_subcompositor = nullptr; - wl_surface* m_wl_child_surface = nullptr; - wl_subsurface* m_wl_child_subsurface = nullptr; -#endif -}; - - -// -------------------------------------------------------------------------------------- -// GSFrame -// -------------------------------------------------------------------------------------- -class GSFrame : public wxFrame - , public EventListener_AppStatus - , public EventListener_CoreThread -{ - typedef wxFrame _parent; - -protected: - wxTimer m_timer_UpdateTitle; - wxWindowID m_id_gspanel; - wxStatusBar* m_statusbar; - -public: - GSFrame( const wxString& title); - virtual ~GSFrame() = default; - - GSPanel* GetViewport(); - void SetFocus(); - bool Show( bool shown=true ); - - bool ShowFullScreen(bool show, bool updateConfig = true); - void UpdateTitleUpdateFreq(); - -protected: - void OnCloseWindow( wxCloseEvent& evt ); - void OnDestroyWindow( wxWindowDestroyEvent& evt ); - void OnMove( wxMoveEvent& evt ); - void OnResize( wxSizeEvent& evt ); - void OnFocus( wxFocusEvent& evt ); - void OnUpdateTitle( wxTimerEvent& evt ); - - void AppStatusEvent_OnSettingsApplied(); - void CoreThread_OnResumed(); - void CoreThread_OnSuspended(); - void CoreThread_OnStopped(); -}; - -// -------------------------------------------------------------------------------------- -// s* macros! ['s' stands for 'shortcut'] -// -------------------------------------------------------------------------------------- -// Use these for "silent fail" invocation of PCSX2 Application-related constructs. If the -// construct (albeit wxApp, MainFrame, CoreThread, etc) is null, the requested method will -// not be invoked, and an optional "else" clause can be affixed for handling the end case. -// -// See App.h (sApp) for more details. -// -#define sGSFrame \ - if( GSFrame* __gsframe_ = wxGetApp().GetGsFramePtr() ) (*__gsframe_) diff --git a/pcsx2/gui/GlobalCommands.cpp b/pcsx2/gui/GlobalCommands.cpp deleted file mode 100644 index 56676e508f..0000000000 --- a/pcsx2/gui/GlobalCommands.cpp +++ /dev/null @@ -1,733 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "MainFrame.h" -#include "GSFrame.h" -#include "Host.h" -#include "ApplyState.h" -#include "ConsoleLogger.h" - -#include "AppAccelerators.h" -#include "AppSaveStates.h" - -#include "Recording/InputRecordingControls.h" -#include "Recording/InputRecording.h" - -// Various includes needed for dumping... -#include "GS.h" -#include "Dump.h" -#include "DebugTools/Debug.h" -#include "R3000A.h" -#include "SPU2/spu2.h" -#include "gui/Dialogs/ModalPopups.h" - -static bool g_Pcsx2Recording = false; // true if recording video and sound - - -KeyAcceleratorCode::KeyAcceleratorCode(const wxKeyEvent& evt) -{ - val32 = 0; - - keycode = evt.GetKeyCode(); - - if (evt.AltDown()) - Alt(); - if (evt.CmdDown()) - Cmd(); - if (evt.ShiftDown()) - Shift(); -} - -wxString KeyAcceleratorCode::ToString() const -{ - // Let's use wx's string formatter: - - return wxAcceleratorEntry( - (cmd ? wxACCEL_CMD : 0) | - (shift ? wxACCEL_SHIFT : 0) | - (alt ? wxACCEL_ALT : 0), - keycode) - .ToString(); -} - -namespace Implementations -{ - void Framelimiter_TurboToggle() - { - ScopedCoreThreadPause pauser; - - if (!g_Conf->EmuOptions.GS.FrameLimitEnable) - { - g_Conf->EmuOptions.GS.FrameLimitEnable = true; - g_Conf->EmuOptions.LimiterMode = LimiterModeType::Turbo; - Host::AddKeyedOSDMessage("FrameLimiter", "Turbo + Frame limiter ENABLED."); - } - else if (g_Conf->EmuOptions.LimiterMode == LimiterModeType::Turbo) - { - g_Conf->EmuOptions.LimiterMode = LimiterModeType::Nominal; - Host::AddKeyedOSDMessage("FrameLimiter", "Turbo DISABLED."); - } - else - { - g_Conf->EmuOptions.LimiterMode = LimiterModeType::Turbo; - Host::AddKeyedOSDMessage("FrameLimiter", "Turbo ENABLED."); - } - - pauser.AllowResume(); - } - - void Framelimiter_SlomoToggle() - { - // Slow motion auto-enables the framelimiter even if it's disabled. - // This seems like desirable and expected behavior. - - // FIXME: Inconsistent use of g_Conf->EmuOptions vs. EmuConfig. Should figure - // out a better consistency approach... -air - - ScopedCoreThreadPause pauser; - if (g_Conf->EmuOptions.LimiterMode == LimiterModeType::Slomo) - { - g_Conf->EmuOptions.LimiterMode = LimiterModeType::Nominal; - Host::AddKeyedOSDMessage("FrameLimiter", "Slow motion DISABLED."); - } - else - { - g_Conf->EmuOptions.LimiterMode = LimiterModeType::Slomo; - Host::AddKeyedOSDMessage("FrameLimiter", "Slow motion ENABLED."); - g_Conf->EmuOptions.GS.FrameLimitEnable = true; - } - - pauser.AllowResume(); - } - - void Framelimiter_MasterToggle() - { - ScopedCoreThreadPause pauser; - g_Conf->EmuOptions.GS.FrameLimitEnable = !g_Conf->EmuOptions.GS.FrameLimitEnable; - Host::AddKeyedFormattedOSDMessage("FrameLimiter", 2.0f, "Frame limiter %s.", g_Conf->EmuOptions.GS.FrameLimitEnable ? "ENABLED" : "DISABLED"); - - // Turbo/Slowmo don't make sense when framelimiter is toggled - g_Conf->EmuOptions.LimiterMode = LimiterModeType::Nominal; - - pauser.AllowResume(); - } - - void GSwindow_CycleAspectRatio() - { - AspectRatioType& art = EmuConfig.CurrentAspectRatio; - const char* arts = "Not modified"; - switch (art) - { - case AspectRatioType::Stretch: - art = AspectRatioType::RAuto4_3_3_2; - arts = "Auto 4:3/3:2"; - break; - case AspectRatioType::RAuto4_3_3_2: - art = AspectRatioType::R4_3; - arts = "4:3"; - break; - case AspectRatioType::R4_3: - art = AspectRatioType::R16_9; - arts = "16:9"; - break; - case AspectRatioType::R16_9: - art = AspectRatioType::Stretch; - arts = "Stretch"; - break; - default: - break; - } - - // Sync the mode with the settings. This is kinda silly, since they won't be - // saved until shutdown, but it matches the behavior pre-settings-move. - g_Conf->EmuOptions.GS.AspectRatio = art; - - // Prevent GS reopening for the setting change. - EmuConfig.GS.AspectRatio = art; - - Host::AddKeyedFormattedOSDMessage("AspectRatio", 2.0f, "Aspect ratio: %s", arts); - } - - void SetZoomY(float zoom) - { - if (zoom <= 0) - return; - g_Conf->EmuOptions.GS.StretchY = zoom; - EmuConfig.GS.StretchY = zoom; - GSConfig.StretchY = zoom; - Host::AddKeyedFormattedOSDMessage("WindowVStretch", 2.0f, "Vertical stretch: %f", zoom); - } - - void GSwindow_ZoomInY() - { - SetZoomY(EmuConfig.GS.StretchY + 1); - } - void GSwindow_ZoomOutY() - { - SetZoomY(EmuConfig.GS.StretchY - 1); - } - void GSwindow_ZoomResetY() - { - SetZoomY(100); - } - - void Sys_Suspend() - { - CoreThread.Suspend(); - - GSFrame* gsframe = wxGetApp().GetGsFramePtr(); - if (gsframe && !wxGetApp().HasGUI() && g_Conf->GSWindow.CloseOnEsc) - { - // When we run with --nogui, PCSX2 only knows to exit when the gs window closes. - // However, by default suspend just hides the gs window, so PCSX2 will not exit - // and there will also be no way to exit it even if no windows are left. - // If the gs window is not set to close on suspend, then the user can still - // close it with the X button, which PCSX2 will recognize and exit. - // So if we're set to close on esc and nogui: - // If the user didn't specify --noguiprompt - exit immediately. - // else prompt to either exit or abort the suspend. - if (!wxGetApp().ExitPromptWithNoGUI() // configured to exit without a dialog - || (wxOK == wxMessageBox(_("Exit PCSX2?"), // or confirmed exit at the dialog - L"PCSX2", - wxICON_WARNING | wxOK | wxCANCEL))) - { - // Pcsx2App knows to exit if no gui and the GS window closes. - gsframe->Close(); - return; - } - else - { - // aborting suspend request - // Note: if we didn't want to suspend emulation for this confirmation dialog, - // then pressing ESC would have exited fullscreen without PCSX2 knowing about it, - // and since it's not suspended it would not re-init the fullscreen state if the - // confirmation is aborted. On such case we'd have needed to set the gsframe - // fullscreen mode here according to g_Conf->GSWindow.IsFullscreen - CoreThread.Resume(); - return; - } - } - - if (g_Conf->GSWindow.CloseOnEsc) - { - sMainFrame.SetFocus(); - } - } - - void Sys_Resume() - { - CoreThread.Resume(); - } - - void Sys_SuspendResume() - { - if (CoreThread.HasPendingStateChangeRequest()) - return; - - if (CoreThread.IsPaused()) - Sys_Resume(); - else - Sys_Suspend(); - } - - void Sys_TakeSnapshot() - { - GSQueueSnapshot(std::string(), 0); - } - - void Sys_RenderToggle() - { - if (GSDump::isRunning) - return; - static bool reentrant = false; - if (!reentrant) - { - reentrant = true; - ScopedCoreThreadPause paused_core; - GetMTGS().ToggleSoftwareRendering(); - paused_core.AllowResume(); - reentrant = false; - } - } - - void Sys_LoggingToggle() - { - // There's likely a better way to implement this, but this seemed useful. - // I might add turning EE, VU0, and VU1 recs on and off by hotkey at some point, too. - // --arcum42 - - // FIXME: Some of the trace logs will require recompiler resets to be activated properly. -#ifdef PCSX2_DEVBUILD - // This is touching the CPU thread's settings, it really shouldn't be, but it'll desync with the UI if we don't. - g_Conf->EmuOptions.Trace.Enabled = !g_Conf->EmuOptions.Trace.Enabled; - EmuConfig.Trace.Enabled = g_Conf->EmuOptions.Trace.Enabled; - Console.WriteLn(g_Conf->EmuOptions.Trace.Enabled ? "Logging Enabled." : "Logging Disabled."); -#endif - } - - void Cpu_DumpRegisters() - { -#ifdef PCSX2_DEVBUILD - iDumpRegisters(cpuRegs.pc, 0); - Console.Warning("hardware registers dumped EE:%x, IOP:%x\n", cpuRegs.pc, psxRegs.pc); -#endif - } - - void FullscreenToggle() - { - if (GSFrame* gsframe = wxGetApp().GetGsFramePtr()) - gsframe->ShowFullScreen(!gsframe->IsFullScreen()); - } - - void States_SaveSlot(int slot) - { - States_SetCurrentSlot(slot); - States_FreezeCurrentSlot(); - } - - void States_LoadSlot(int slot) - { - States_SetCurrentSlot(slot); - States_DefrostCurrentSlot(); - } - - void States_SaveSlot0() - { - States_SaveSlot(0); - } - - void States_SaveSlot1() - { - States_SaveSlot(1); - } - - void States_SaveSlot2() - { - States_SaveSlot(2); - } - - void States_SaveSlot3() - { - States_SaveSlot(3); - } - - void States_SaveSlot4() - { - States_SaveSlot(4); - } - - void States_SaveSlot5() - { - States_SaveSlot(5); - } - - void States_SaveSlot6() - { - States_SaveSlot(6); - } - - void States_SaveSlot7() - { - States_SaveSlot(7); - } - - void States_SaveSlot8() - { - States_SaveSlot(8); - } - - void States_SaveSlot9() - { - States_SaveSlot(9); - } - - void States_LoadSlot0() - { - States_LoadSlot(0); - } - - void States_LoadSlot1() - { - States_LoadSlot(1); - } - - void States_LoadSlot2() - { - States_LoadSlot(2); - } - - void States_LoadSlot3() - { - States_LoadSlot(3); - } - - void States_LoadSlot4() - { - States_LoadSlot(4); - } - - void States_LoadSlot5() - { - States_LoadSlot(5); - } - - void States_LoadSlot6() - { - States_LoadSlot(6); - } - - void States_LoadSlot7() - { - States_LoadSlot(7); - } - - void States_LoadSlot8() - { - States_LoadSlot(8); - } - - void States_LoadSlot9() - { - States_LoadSlot(9); - } -} // namespace Implementations - -// -------------------------------------------------------------------------------------- -// CommandDeclarations table -// -------------------------------------------------------------------------------------- -// This is our manualized introspection/reflection table. In a cool language like C# we'd -// have just grabbed this info from enumerating the members of a class and assigning -// properties to each method in the class. But since this is C++, we have to do the the -// goold old fashioned way! :) - -static const GlobalCommandDescriptor CommandDeclarations[] = - { - { - "States_FreezeCurrentSlot", - States_FreezeCurrentSlot, - pxL("Save state"), - pxL("Saves the virtual machine state to the current slot."), - false, - }, - - { - "States_DefrostCurrentSlot", - States_DefrostCurrentSlot, - pxL("Load state"), - pxL("Loads a virtual machine state from the current slot."), - false, - }, - - { - "States_DefrostCurrentSlotBackup", - States_DefrostCurrentSlotBackup, - pxL("Load State Backup"), - pxL("Loads virtual machine state backup for current slot."), - false, - }, - - { - "States_CycleSlotForward", - States_CycleSlotForward, - pxL("Cycle to next slot"), - pxL("Cycles the current save slot in +1 fashion!"), - false, - }, - - { - "States_CycleSlotBackward", - States_CycleSlotBackward, - pxL("Cycle to prev slot"), - pxL("Cycles the current save slot in -1 fashion!"), - false, - }, - - { - "Framelimiter_TurboToggle", - Implementations::Framelimiter_TurboToggle, - NULL, - NULL, - false, - }, - - { - "Framelimiter_SlomoToggle", - Implementations::Framelimiter_SlomoToggle, - NULL, - NULL, - false, - }, - - { - "Framelimiter_MasterToggle", - Implementations::Framelimiter_MasterToggle, - NULL, - NULL, - false, - }, - - { - "GSwindow_CycleAspectRatio", - Implementations::GSwindow_CycleAspectRatio, - NULL, - NULL, - true, - }, - - {"GSwindow_ZoomInY", Implementations::GSwindow_ZoomInY, NULL, NULL, false}, - {"GSwindow_ZoomOutY", Implementations::GSwindow_ZoomOutY, NULL, NULL, false}, - {"GSwindow_ZoomResetY", Implementations::GSwindow_ZoomResetY, NULL, NULL, false}, - - { - "Sys_SuspendResume", - Implementations::Sys_SuspendResume, - NULL, - NULL, - false, - }, - - { - "Sys_TakeSnapshot", - Implementations::Sys_TakeSnapshot, - NULL, - NULL, - false, - }, - - { - "Sys_RenderswitchToggle", - Implementations::Sys_RenderToggle, - NULL, - NULL, - false, - }, - - { - "Sys_LoggingToggle", - Implementations::Sys_LoggingToggle, - NULL, - NULL, - false, - }, - - { - "FullscreenToggle", - Implementations::FullscreenToggle, - NULL, - NULL, - false, - }, - - {"States_SaveSlot0", Implementations::States_SaveSlot0, NULL, NULL, false}, - {"States_SaveSlot1", Implementations::States_SaveSlot1, NULL, NULL, false}, - {"States_SaveSlot2", Implementations::States_SaveSlot2, NULL, NULL, false}, - {"States_SaveSlot3", Implementations::States_SaveSlot3, NULL, NULL, false}, - {"States_SaveSlot4", Implementations::States_SaveSlot4, NULL, NULL, false}, - {"States_SaveSlot5", Implementations::States_SaveSlot5, NULL, NULL, false}, - {"States_SaveSlot6", Implementations::States_SaveSlot6, NULL, NULL, false}, - {"States_SaveSlot7", Implementations::States_SaveSlot7, NULL, NULL, false}, - {"States_SaveSlot8", Implementations::States_SaveSlot8, NULL, NULL, false}, - {"States_SaveSlot9", Implementations::States_SaveSlot9, NULL, NULL, false}, - - {"States_LoadSlot0", Implementations::States_LoadSlot0, NULL, NULL, false}, - {"States_LoadSlot1", Implementations::States_LoadSlot1, NULL, NULL, false}, - {"States_LoadSlot2", Implementations::States_LoadSlot2, NULL, NULL, false}, - {"States_LoadSlot3", Implementations::States_LoadSlot3, NULL, NULL, false}, - {"States_LoadSlot4", Implementations::States_LoadSlot4, NULL, NULL, false}, - {"States_LoadSlot5", Implementations::States_LoadSlot5, NULL, NULL, false}, - {"States_LoadSlot6", Implementations::States_LoadSlot6, NULL, NULL, false}, - {"States_LoadSlot7", Implementations::States_LoadSlot7, NULL, NULL, false}, - {"States_LoadSlot8", Implementations::States_LoadSlot8, NULL, NULL, false}, - {"States_LoadSlot9", Implementations::States_LoadSlot9, NULL, NULL, false}, - // Command Declarations terminator: - // (must always be last in list!!) - {NULL}}; - -void AcceleratorDictionary::Map(const KeyAcceleratorCode& _acode, const char* searchfor) -{ - // Search override mapping at ini file - KeyAcceleratorCode acode = _acode; - wxString overrideStr; - wxAcceleratorEntry codeParser; //Provides string parsing capabilities - wxFileConfig cfg(L"", L"", L"", GetUiKeysFilename(), wxCONFIG_USE_GLOBAL_FILE); - if (cfg.Read(wxString::FromUTF8(searchfor), &overrideStr)) - { - // needs a '\t' prefix (originally used for wxMenu accelerators parsing)... - if (codeParser.FromString(wxString(L"\t") + overrideStr)) - { - // ini file contains alternative parsable key combination for current 'searchfor'. - acode = codeParser; - if (acode.keycode >= 'A' && acode.keycode <= 'Z') - { - // Note that this needs to match the key event codes at Pcsx2App::PadKeyDispatch - // Our canonical representation is the char code (at lower case if - // applicable) with a separate modifier indicator, including shift. - // The parser deviates from this by setting the keycode to upper case if - // modifiers are used with plain letters. Luckily, it sets the modifiers - // correctly, including shift (for letters without modifiers it parses lower case). - // So we only need to change upper case letters to lower case. - acode.keycode += 'a' - 'A'; - } - if (_acode.ToString() != acode.ToString()) - { - Console.WriteLn(Color_StrongGreen, "Overriding '%ls': assigning %ls (instead of %ls)", - WX_STR(fromUTF8(searchfor)), WX_STR(acode.ToString()), WX_STR(_acode.ToString())); - } - } - else - { - Console.Error("Error overriding KB shortcut for '%ls': can't understand '%ls'", - WX_STR(fromUTF8(searchfor)), WX_STR(overrideStr)); - } - } - // End of overrides section - - const GlobalCommandDescriptor* result = NULL; - - std::unordered_map::const_iterator iter(find(acode.val32)); - if (iter != end()) - result = iter->second; - - if (result != NULL) - { - Console.Warning( - "Kbd Accelerator '%ls' is mapped multiple times.\n" - "\t'Command %ls' is being replaced by '%ls'", - WX_STR(acode.ToString()), WX_STR(fromUTF8(result->Id)), WX_STR(fromUTF8(searchfor))); - } - - std::unordered_map::const_iterator acceleratorIter(wxGetApp().GlobalCommands->find(searchfor)); - - if (acceleratorIter != wxGetApp().GlobalCommands->end()) - result = acceleratorIter->second; - - if (result == NULL) - { - Console.Warning("Kbd Accelerator '%ls' is mapped to unknown command '%ls'", - WX_STR(acode.ToString()), WX_STR(fromUTF8(searchfor))); - } - else - { - if (!strcmp("Sys_TakeSnapshot", searchfor)) - { - // Sys_TakeSnapshot is special in a bad way. On its own it creates a screenshot - // but GS also checks whether shift or ctrl are held down, and for each of - // them it does a different thing (gs dumps). So we need to map a shortcut and - // also the same shortcut with shift and the same with ctrl to the same function. - // So make sure the shortcut doesn't include shift or ctrl, and then add two more - // which are derived from it. - // Also, looking at the GS code, it seems that it never cares about both shift - // and ctrl held together, but PCSX2 traditionally mapped f8, shift-f8 and ctrl-shift-f8 - // to Sys_TakeSnapshot, so let's not change it - we'll keep adding only shift and - // ctrl-shift to the base shortcut. - if (acode.cmd || acode.shift) - { - Console.Error("Cannot map %ls to Sys_TakeSnapshot - must not include Shift or Ctrl - these modifiers will be added automatically.", - WX_STR(acode.ToString())); - } - else - { - KeyAcceleratorCode shifted(acode); - shifted.Shift(); - KeyAcceleratorCode controlledShifted(shifted); - controlledShifted.Cmd(); - operator[](acode.val32) = result; - operator[](shifted.val32) = result; - operator[](controlledShifted.val32) = result; - - if (_acode.val32 != acode.val32) - { // overriding default - Console.WriteLn(Color_Green, "Sys_TakeSnapshot: automatically mapping also %ls and %ls", - WX_STR(shifted.ToString()), - WX_STR(controlledShifted.ToString())); - } - } - } - else - { - operator[](acode.val32) = result; - } - } -} - -KeyAcceleratorCode AcceleratorDictionary::findKeycodeWithCommandId(const char* commandId) -{ - for (auto entry = this->begin(); entry != this->end(); entry++) - { - if (strcmp(entry->second->Id, commandId) == 0) - { - const KeyAcceleratorCode keycode(entry->first); - return keycode; - } - } - return KeyAcceleratorCode(0); -} - -void Pcsx2App::BuildCommandHash() -{ - if (!GlobalCommands) - GlobalCommands = std::unique_ptr(new CommandDictionary); - - const GlobalCommandDescriptor* curcmd = CommandDeclarations; - while (curcmd->Invoke != NULL) - { - (*GlobalCommands)[curcmd->Id] = curcmd; - curcmd++; - } -} - -void Pcsx2App::InitDefaultGlobalAccelerators() -{ - typedef KeyAcceleratorCode AAC; - - if (!GlobalAccels) - GlobalAccels = std::unique_ptr(new AcceleratorDictionary); - - // Why do we even have those here? all of them seem to be overridden - // by GSPanel::m_Accels ( GSPanel::InitDefaultAccelerators() ) - // - One reason is because this is used to initialize shortcuts in the MainFrame's UI (see - MainFrame::AppendShortcutToMenuOption) - // this is before the GS Window has been initialized. - - GlobalAccels->Map(AAC(WXK_F1), "States_FreezeCurrentSlot"); - GlobalAccels->Map(AAC(WXK_F3), "States_DefrostCurrentSlot"); - GlobalAccels->Map(AAC(WXK_F2), "States_CycleSlotForward"); - GlobalAccels->Map(AAC(WXK_F2).Shift(), "States_CycleSlotBackward"); - - GlobalAccels->Map(AAC(WXK_F4), "Framelimiter_MasterToggle"); - - // At this early stage of startup, the application assumes installed mode, so portable mode custom keybindings may present issues. - // Relevant - https://github.com/PCSX2/pcsx2/blob/678829a5b2b8ca7a3e42d8edc9ab201bf00b0fe9/pcsx2/gui/AppInit.cpp#L479 - // Compared to L990 of GlobalCommands.cpp which also does an init for the GlobalAccelerators. - // The idea was to have: Reading from the PCSX2_keys.ini in the ini folder based on PCSX2_keys.ini.default which get overridden. - // We also need to make it easier to do custom hotkeys for both normal/portable PCSX2 in the GUI. - GlobalAccels->Map(AAC(WXK_TAB), "Framelimiter_TurboToggle"); - GlobalAccels->Map(AAC(WXK_TAB).Shift(), "Framelimiter_SlomoToggle"); - - GlobalAccels->Map(AAC(WXK_F6), "GSwindow_CycleAspectRatio"); - GlobalAccels->Map(AAC(WXK_RETURN).Alt(), "FullscreenToggle"); - - GlobalAccels->Map(AAC(WXK_ESCAPE), "Sys_SuspendResume"); - - // Fixme: GS Dumps could need a seperate label and hotkey binding or less interlinked with normal screenshots/snapshots , which messes with overloading lots of different mappings, commented the other GlobalAccels for this reason. GS hardcodes keybindings. - GlobalAccels->Map(AAC(WXK_F8), "Sys_TakeSnapshot"); - // GlobalAccels->Map(AAC(WXK_F8).Shift(), "Sys_TakeSnapshot"); - // GlobalAccels->Map(AAC(WXK_F8).Shift().Cmd(), "Sys_TakeSnapshot"); - GlobalAccels->Map(AAC(WXK_F9), "Sys_RenderswitchToggle"); - - // GlobalAccels->Map(AAC(WXK_F10), "Sys_LoggingToggle"); - // GlobalAccels->Map(AAC(WXK_F11), "Sys_FreezeGS"); - GlobalAccels->Map(AAC(WXK_F12), "Sys_RecordingToggle"); -} diff --git a/pcsx2/gui/IniInterface.cpp b/pcsx2/gui/IniInterface.cpp deleted file mode 100644 index ef60907567..0000000000 --- a/pcsx2/gui/IniInterface.cpp +++ /dev/null @@ -1,451 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include - -#include "gui/IniInterface.h" -#include "gui/StringHelpers.h" -#include "common/Assertions.h" -#include "common/Console.h" - -const wxRect wxDefaultRect(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord); - -wxDirName g_fullBaseDirName = wxDirName(L""); -void SetFullBaseDir(wxDirName appRoot) -{ - g_fullBaseDirName = appRoot; -} - -static int _calcEnumLength(const wxChar* const* enumArray) -{ - int cnt = 0; - while (*enumArray != NULL) - { - enumArray++; - cnt++; - } - - return cnt; -} - -ScopedIniGroup::ScopedIniGroup(IniInterface& mommy, const wxString& group) - : m_mom(mommy) -{ - pxAssertDev(wxStringTokenize(group, L"/").Count() <= 1, "Cannot nest more than one group deep per instance of ScopedIniGroup."); - m_mom.SetPath(group); -} - -ScopedIniGroup::~ScopedIniGroup() -{ - m_mom.SetPath(L".."); -} - -// -------------------------------------------------------------------------------------- -// IniInterface (implementations) -// -------------------------------------------------------------------------------------- -IniInterface::IniInterface(wxConfigBase& config) -{ - m_Config = &config; -} - -IniInterface::IniInterface(wxConfigBase* config) -{ - m_Config = config; -} - -IniInterface::IniInterface() -{ - m_Config = wxConfigBase::Get(false); -} - -IniInterface::~IniInterface() -{ - Flush(); -} - -void IniInterface::SetPath(const wxString& path) -{ - if (m_Config) - m_Config->SetPath(path); -} - -void IniInterface::Flush() -{ - if (m_Config) - m_Config->Flush(); -} - - -// -------------------------------------------------------------------------------------- -// IniLoader (implementations) -// -------------------------------------------------------------------------------------- -IniLoader::IniLoader(wxConfigBase& config) - : IniInterface(config) -{ -} - -IniLoader::IniLoader(wxConfigBase* config) - : IniInterface(config) -{ -} - -IniLoader::IniLoader() - : IniInterface() -{ -} - -void IniLoader::Entry(const wxString& var, wxString& value, const wxString defvalue) -{ - if (m_Config) - m_Config->Read(var, &value, defvalue); - else - value = defvalue; -} - -void IniLoader::Entry(const wxString& var, wxDirName& value, const wxDirName defvalue, bool isAllowRelative) -{ - wxString dest; - if (m_Config) - m_Config->Read(var, &dest, wxEmptyString); - - if (dest.IsEmpty()) - value = defvalue; - else - { - value = dest; - if (isAllowRelative) - value = g_fullBaseDirName + value; - - if (value.IsAbsolute()) - value.Normalize(); - } -} - -void IniLoader::Entry(const wxString& var, wxFileName& value, const wxFileName defvalue, bool isAllowRelative) -{ - wxString dest(defvalue.GetFullPath()); - if (m_Config) - m_Config->Read(var, &dest, defvalue.GetFullPath()); - value = dest; - if (isAllowRelative) - value = g_fullBaseDirName + value; - - if (value.IsAbsolute()) - value.Normalize(); - - if (value.HasVolume()) - value.SetVolume(value.GetVolume().Upper()); -} - -void IniLoader::Entry(const wxString& var, int& value, const int defvalue) -{ - if (m_Config) - m_Config->Read(var, &value, defvalue); - else - value = defvalue; -} - -void IniLoader::Entry(const wxString& var, uint& value, const uint defvalue) -{ - if (m_Config) - m_Config->Read(var, (int*)&value, (int)defvalue); - else - value = defvalue; -} - -void IniLoader::Entry(const wxString& var, bool& value, const bool defvalue) -{ - // TODO : Stricter value checking on enabled/disabled? - wxString dest; - if (defvalue) - dest = wxString("enabled"); - else - dest = wxString("disabled"); - - if (m_Config) - m_Config->Read(var, &dest, dest); - value = (dest == L"enabled") || (dest == L"1"); -} - -bool IniLoader::EntryBitBool(const wxString& var, bool value, const bool defvalue) -{ - // Note: 'value' param is used by inisaver only. - bool result; - Entry(var, result, defvalue); - return result; -} - -int IniLoader::EntryBitfield(const wxString& var, int value, const int defvalue) -{ - int result; - Entry(var, result, defvalue); - return result; -} - -void IniLoader::Entry(const wxString& var, float& value, const float defvalue) -{ - auto readval = wxString::FromCDouble(static_cast(value)); - - if (m_Config) - m_Config->Read(var, &readval); - - double dvalue; - if (!readval.ToCDouble(&dvalue)) - dvalue = 0.0; - value = static_cast(dvalue); -} - -void IniLoader::Entry(const wxString& var, wxPoint& value, const wxPoint defvalue) -{ - if (!m_Config) - { - value = defvalue; - return; - } - TryParse(value, m_Config->Read(var, ToString(defvalue)), defvalue); -} - -void IniLoader::Entry(const wxString& var, wxSize& value, const wxSize defvalue) -{ - if (!m_Config) - { - value = defvalue; - return; - } - TryParse(value, m_Config->Read(var, ToString(defvalue)), defvalue); -} - -void IniLoader::Entry(const wxString& var, wxRect& value, const wxRect defvalue) -{ - if (!m_Config) - { - value = defvalue; - return; - } - TryParse(value, m_Config->Read(var, ToString(defvalue)), defvalue); -} - -void IniLoader::_EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) -{ - // Confirm default value sanity... - - const int cnt = _calcEnumLength(enumArray); - if (defvalue > cnt) - { - Console.Error("(LoadSettings) Default enumeration index is out of bounds. Truncating."); - defvalue = cnt - 1; - } - - // Sanity confirmed, proceed with craziness! - - if (!m_Config) - { - value = defvalue; - return; - } - - wxString retval; - m_Config->Read(var, &retval, enumArray[defvalue]); - - int i = 0; - while (enumArray[i] != NULL && (retval != enumArray[i])) - i++; - - if (enumArray[i] == NULL) - { - Console.Warning("(LoadSettings) Warning: Unrecognized value '%ls' on key '%ls'\n\tUsing the default setting of '%ls'.", - WX_STR(retval), WX_STR(var), enumArray[defvalue]); - value = defvalue; - } - else - value = i; -} - -void IniLoader::Entry(const wxString& var, std::string& value, const std::string& default_value) -{ - if (m_Config) - { - wxString temp; - m_Config->Read(var, &temp, fromUTF8(default_value)); - value = temp.ToStdString(); - } - else if (&value != &default_value) - { - value.assign(default_value); - } -} - -// -------------------------------------------------------------------------------------- -// IniSaver (implementations) -// -------------------------------------------------------------------------------------- - -IniSaver::IniSaver(wxConfigBase& config) - : IniInterface(config) -{ -} - -IniSaver::IniSaver(wxConfigBase* config) - : IniInterface(config) -{ -} - -IniSaver::IniSaver() - : IniInterface() -{ -} - -void IniSaver::Entry(const wxString& var, wxString& value, const wxString defvalue) -{ - if (!m_Config) - return; - m_Config->Write(var, value); -} - -void IniSaver::Entry(const wxString& var, wxDirName& value, const wxDirName defvalue, bool isAllowRelative) -{ - if (!m_Config) - return; - wxDirName res(value); - - if (res.IsAbsolute()) - res.Normalize(); - - if (isAllowRelative) - res = wxDirName::MakeAutoRelativeTo(res, g_fullBaseDirName.ToString()); - - - /*if( value == defvalue ) - m_Config->Write( var, wxString() ); - else*/ - m_Config->Write(var, res.ToString()); -} - -void IniSaver::Entry(const wxString& var, wxFileName& value, const wxFileName defvalue, bool isAllowRelative) -{ - if (!m_Config) - return; - wxFileName res(value); - - if (res.IsAbsolute()) - res.Normalize(); - - if (isAllowRelative) - res = wxDirName::MakeAutoRelativeTo(res, g_fullBaseDirName.ToString()); - - m_Config->Write(var, res.GetFullPath()); -} - -void IniSaver::Entry(const wxString& var, int& value, const int defvalue) -{ - if (!m_Config) - return; - m_Config->Write(var, value); -} - -void IniSaver::Entry(const wxString& var, uint& value, const uint defvalue) -{ - if (!m_Config) - return; - m_Config->Write(var, (int)value); -} - -void IniSaver::Entry(const wxString& var, bool& value, const bool defvalue) -{ - if (!m_Config) - return; - m_Config->Write(var, value ? L"enabled" : L"disabled"); -} - -bool IniSaver::EntryBitBool(const wxString& var, bool value, const bool defvalue) -{ - if (m_Config) - m_Config->Write(var, value ? L"enabled" : L"disabled"); - return value; -} - -int IniSaver::EntryBitfield(const wxString& var, int value, const int defvalue) -{ - if (m_Config) - m_Config->Write(var, value); - return value; -} - -void IniSaver::Entry(const wxString& var, float& value, const float defvalue) -{ - if (!m_Config) - return; - - m_Config->Write(var, wxString::FromCDouble(static_cast(value))); -} - -void IniSaver::Entry(const wxString& var, wxPoint& value, const wxPoint defvalue) -{ - if (!m_Config) - return; - m_Config->Write(var, ToString(value)); -} - -void IniSaver::Entry(const wxString& var, wxSize& value, const wxSize defvalue) -{ - if (!m_Config) - return; - m_Config->Write(var, ToString(value)); -} - -void IniSaver::Entry(const wxString& var, wxRect& value, const wxRect defvalue) -{ - if (!m_Config) - return; - m_Config->Write(var, ToString(value)); -} - -void IniSaver::_EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) -{ - const int cnt = _calcEnumLength(enumArray); - - // Confirm default value sanity... - - if (defvalue > cnt) - { - Console.Error("(SaveSettings) Default enumeration index is out of bounds. Truncating."); - defvalue = cnt - 1; - } - - if (!m_Config) - return; - - if (value >= cnt) - { - Console.Warning("(SaveSettings) An illegal enumerated index was detected when saving '%ls'", WX_STR(var)); - Console.Indent().Warning( - "Illegal Value: %d\n" - "Using Default: %d (%ls)\n", - value, defvalue, enumArray[defvalue]); - - // Cause a debug assertion, since this is a fully recoverable error. - pxAssert(value < cnt); - - value = defvalue; - } - - m_Config->Write(var, enumArray[value]); -} - -void IniSaver::Entry(const wxString& var, std::string& value, const std::string& default_value) -{ - if (!m_Config) - return; - m_Config->Write(var, fromUTF8(value)); -} diff --git a/pcsx2/gui/IniInterface.h b/pcsx2/gui/IniInterface.h deleted file mode 100644 index f1baa45e33..0000000000 --- a/pcsx2/gui/IniInterface.h +++ /dev/null @@ -1,200 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "common/Assertions.h" -#include "common/Path.h" -#include "wxDirName.h" -#include "StringHelpers.h" -#include -#include -#include - -// -------------------------------------------------------------------------------------- -// IniInterface (abstract base class) -// -------------------------------------------------------------------------------------- -// This is used as an interchangable interface for both loading and saving options from an -// ini/configuration file. The LoadSave code takes an IniInterface, and the interface -// implementation defines whether the options are read or written. -// -// See also: IniLoader, IniSaver -// -class IniInterface -{ -protected: - wxConfigBase* m_Config; - -public: - virtual ~IniInterface(); - explicit IniInterface(); - explicit IniInterface(wxConfigBase& config); - explicit IniInterface(wxConfigBase* config); - - void SetPath(const wxString& path); - void Flush(); - - wxConfigBase& GetConfig() - { - pxAssert(m_Config); - return *m_Config; - } - bool IsOk() const { return m_Config != NULL; } - - virtual bool IsLoading() const = 0; - bool IsSaving() const { return !IsLoading(); } - - virtual void Entry(const wxString& var, int& value, const int defvalue = 0) = 0; - virtual void Entry(const wxString& var, uint& value, const uint defvalue = 0) = 0; - virtual void Entry(const wxString& var, bool& value, const bool defvalue = false) = 0; - virtual void Entry(const wxString& var, float& value, const float defvalue = 0.0) = 0; - virtual void Entry(const wxString& var, std::string& value, const std::string& default_value = std::string()) = 0; - - // This special form of Entry is provided for bitfields, which cannot be passed by reference. - virtual bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) = 0; - virtual int EntryBitfield(const wxString& var, int value, const int defvalue = 0) = 0; - - virtual void Entry(const wxString& var, wxString& value, const wxString defvalue = wxString()) = 0; - virtual void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) = 0; - virtual void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) = 0; - - virtual void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) = 0; - virtual void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) = 0; - virtual void Entry(const wxString& var, wxRect& value, const wxRect defvalue = wxDefaultRect) = 0; - - template - void EnumEntry(const wxString& var, T& value, const wxChar* const* enumArray = NULL, const T defvalue = (T)0) - { - int tstore = (int)value; - auto defaultvalue = enum_cast(defvalue); - if (enumArray == NULL) - Entry(var, tstore, defaultvalue); - else - _EnumEntry(var, tstore, enumArray, defaultvalue); - value = (T)tstore; - } - -protected: - virtual void _EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) = 0; -}; - -// -------------------------------------------------------------------------------------- -// ScopedIniGroup -// -------------------------------------------------------------------------------------- -class ScopedIniGroup -{ -protected: - IniInterface& m_mom; - -public: - ScopedIniGroup(IniInterface& mommy, const wxString& group); - virtual ~ScopedIniGroup(); -}; - -// -------------------------------------------------------------------------------------- -// IniLoader -// -------------------------------------------------------------------------------------- -// Implementation of the IniInterface base class, which maps ini actions to loading from -// an ini source file. -// -// See also: IniInterface -// -class IniLoader : public IniInterface -{ -public: - virtual ~IniLoader() = default; - explicit IniLoader(); - explicit IniLoader(wxConfigBase& config); - explicit IniLoader(wxConfigBase* config); - - bool IsLoading() const override { return true; } - - void Entry(const wxString& var, int& value, const int defvalue = 0) override; - void Entry(const wxString& var, uint& value, const uint defvalue = 0) override; - void Entry(const wxString& var, bool& value, const bool defvalue = false) override; - void Entry(const wxString& var, float& value, const float defvalue = 0.0) override; - void Entry(const wxString& var, std::string& value, const std::string& default_value = std::string()) override; - - bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) override; - int EntryBitfield(const wxString& var, int value, const int defvalue = 0) override; - - void Entry(const wxString& var, wxString& value, const wxString defvalue = wxEmptyString) override; - void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) override; - void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) override; - - void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) override; - void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) override; - void Entry(const wxString& var, wxRect& value, const wxRect defvalue = wxDefaultRect) override; - - -protected: - void _EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) override; -}; - -// -------------------------------------------------------------------------------------- -// IniSaver -// -------------------------------------------------------------------------------------- -// Implementation of the IniInterface base class, which maps ini actions to saving to -// an ini dest file. -// -// See also: IniInterface -// -class IniSaver : public IniInterface -{ -public: - virtual ~IniSaver() = default; - explicit IniSaver(); - explicit IniSaver(wxConfigBase& config); - explicit IniSaver(wxConfigBase* config); - - bool IsLoading() const override { return false; } - - void Entry(const wxString& var, int& value, const int defvalue = 0) override; - void Entry(const wxString& var, uint& value, const uint defvalue = 0) override; - void Entry(const wxString& var, bool& value, const bool defvalue = false) override; - void Entry(const wxString& var, float& value, const float defvalue = 0.0) override; - void Entry(const wxString& var, std::string& value, const std::string& default_value = std::string()) override; - - bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) override; - int EntryBitfield(const wxString& var, int value, const int defvalue = 0) override; - - void Entry(const wxString& var, wxString& value, const wxString defvalue = wxString()) override; - void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) override; - void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) override; - - void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) override; - void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) override; - void Entry(const wxString& var, wxRect& value, const wxRect defvalue = wxDefaultRect) override; - - -protected: - void _EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) override; -}; - -// ------------------------------------------------------------------------ -// GCC Note: wxT() macro is required when using string token pasting. For some reason L generates -// syntax errors. >_< -// -#define IniEntry(varname) ini.Entry(wxT(#varname), varname, varname) -#define IniEntryDirFile(varname, isAllowRelative) ini.Entry(wxT(#varname), varname, varname, isAllowRelative) -#define IniBitfield(varname) varname = ini.EntryBitfield(wxT(#varname), varname, varname) -#define IniBitBool(varname) varname = ini.EntryBitBool(wxT(#varname), !!varname, varname) - -#define IniBitfieldEx(varname, textname) varname = ini.EntryBitfield(wxT(textname), varname, varname) -#define IniBitBoolEx(varname, textname) varname = ini.EntryBitBool(wxT(textname), !!varname, varname) - -//used for filenames and folder names as ini values. -//Set to app root folder, so all files and folders which are inside appRoot will be written as relative. -void SetFullBaseDir(wxDirName appRoot); diff --git a/pcsx2/gui/IsoDropTarget.cpp b/pcsx2/gui/IsoDropTarget.cpp deleted file mode 100644 index 63c3b0b7d1..0000000000 --- a/pcsx2/gui/IsoDropTarget.cpp +++ /dev/null @@ -1,208 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "IsoDropTarget.h" - -#include "Dialogs/ModalPopups.h" - -#include "common/StringUtil.h" -#include "CDVD/IsoFileFormats.h" - -#include - - -wxString GetMsg_ConfirmSysReset() -{ - return pxE( L"This action will reset the existing PS2 virtual machine state; all current progress will be lost. Are you sure?" - ); -} - -// -------------------------------------------------------------------------------------- -// DroppedTooManyFiles -// -------------------------------------------------------------------------------------- -class DroppedTooManyFiles : public pxActionEvent -{ -protected: - wxWindowID m_ownerid; - -public: - DroppedTooManyFiles( const wxWindow* window ) - : pxActionEvent() - , m_ownerid(window->GetId()) - { - } - - virtual ~DroppedTooManyFiles() = default; - virtual DroppedTooManyFiles *Clone() const { return new DroppedTooManyFiles(*this); } - -protected: - virtual void InvokeEvent() - { - ScopedCoreThreadPopup stopped_core; - - wxDialogWithHelpers dialog( wxWindow::FindWindowById(m_ownerid), _("Drag and Drop Error") ); - dialog += dialog.Heading(AddAppName(_("It is an error to drop multiple files onto a %s window. One at a time please, thank you."))); - pxIssueConfirmation( dialog, MsgButtons().Cancel() ); - } -}; - -// -------------------------------------------------------------------------------------- -// DroppedElf -// -------------------------------------------------------------------------------------- -class DroppedElf : public pxActionEvent -{ -protected: - wxWindowID m_ownerid; - -public: - DroppedElf( const wxWindow* window ) - : pxActionEvent() - , m_ownerid(window->GetId()) - { - } - - virtual ~DroppedElf() = default; - virtual DroppedElf *Clone() const { return new DroppedElf(*this); } - -protected: - virtual void InvokeEvent() - { - ScopedCoreThreadPopup stopped_core; - - bool confirmed = true; - if( SysHasValidState() ) - { - wxDialogWithHelpers dialog( wxWindow::FindWindowById(m_ownerid), _("Confirm PS2 Reset") ); - - dialog += dialog.Heading(AddAppName(_("You have dropped the following ELF binary into %s:\n\n"))); - dialog += dialog.GetCharHeight(); - dialog += dialog.Text( g_Conf->CurrentELF ); - dialog += dialog.GetCharHeight(); - dialog += dialog.Heading(GetMsg_ConfirmSysReset()); - - confirmed = (pxIssueConfirmation( dialog, MsgButtons().Reset().Cancel(), L"DragDrop.BootELF" ) != wxID_CANCEL); - } - - if( confirmed ) - { - g_Conf->EmuOptions.UseBOOT2Injection = true; - sApp.SysExecute( g_Conf->CdvdSource, g_Conf->CurrentELF ); - } - else - stopped_core.AllowResume(); - } -}; - -// -------------------------------------------------------------------------------------- -// DroppedIso -// -------------------------------------------------------------------------------------- -class DroppedIso : public pxActionEvent -{ -protected: - wxWindowID m_ownerid; - wxString m_filename; - -public: - DroppedIso( const wxWindow* window, const wxString& filename ) - : pxActionEvent() - , m_ownerid(window->GetId()) - , m_filename(filename) - { - } - - virtual ~DroppedIso() = default; - virtual DroppedIso *Clone() const { return new DroppedIso(*this); } - -protected: - virtual void InvokeEvent() - { - ScopedCoreThreadPopup stopped_core; - SwapOrReset_Iso(wxWindow::FindWindowById(m_ownerid), stopped_core, m_filename, - AddAppName(_("You have dropped the following ISO image into %s:")) - ); - } -}; - -bool IsoDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) -{ - // WARNING: Doing *anything* from the context of OnDropFiles will result in Windows - // Explorer getting tied up waiting for a response from the application's message pump. - // So whenever possible, issue messages from this function only, such that the - // messages are processed later on after the application has allowed Explorer to resume - // itself. - // - // This most likely *includes* throwing exceptions, hence all exceptions here-in being - // caught and re-packaged as messages posted back to the application, so that the drag& - // drop procedure is free to release the Windows Explorer from the tyranny of drag&drop - // interplay. - - try - { - if( filenames.GetCount() > 1 ) - { - wxGetApp().AddIdleEvent( DroppedTooManyFiles(m_WindowBound) ); - return false; - } - - Console.WriteLn( "(Drag&Drop) Received filename: %ls", WX_STR(filenames[0]) ); - - // --------------- - // ELF CHECK - // --------------- - { - wxFileInputStream filechk( filenames[0] ); - - if( !filechk.IsOk() ) - throw Exception::CannotCreateStream(StringUtil::wxStringToUTF8String(filenames[0])); - - u8 ident[16]; - filechk.Read( ident, 16 ); - static const u8 elfIdent[4] = { 0x7f, 'E', 'L', 'F' }; - - if( ((u32&)ident) == ((u32&)elfIdent) ) - { - Console.WriteLn( "(Drag&Drop) Found ELF file type!" ); - - g_Conf->CurrentELF = filenames[0]; - - wxGetApp().PostEvent( DroppedElf(m_WindowBound) ); - return true; - } - } - - // --------------- - // ISO CHECK - // --------------- - - InputIsoFile iso; - - if (iso.Test( StringUtil::wxStringToUTF8String(filenames[0]) )) - { - DevCon.WriteLn( "(Drag&Drop) Found valid ISO file type!" ); - wxGetApp().PostEvent( DroppedIso(m_WindowBound, filenames[0]) ); - return true; - } - } - catch (BaseException& ex) - { - wxGetApp().AddIdleEvent( pxExceptionEvent(ex) ); - } - catch (std::runtime_error& ex) - { - wxGetApp().AddIdleEvent( pxExceptionEvent(Exception::RuntimeError(ex)) ); - } - return false; -} diff --git a/pcsx2/gui/IsoDropTarget.h b/pcsx2/gui/IsoDropTarget.h deleted file mode 100644 index bc51f00d9f..0000000000 --- a/pcsx2/gui/IsoDropTarget.h +++ /dev/null @@ -1,41 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "AppCommon.h" -#include - -// -------------------------------------------------------------------------------------- -// IsoDropTarget -// -------------------------------------------------------------------------------------- -class IsoDropTarget : public wxFileDropTarget -{ -protected: - wxWindow* m_WindowBound; - -public: - virtual ~IsoDropTarget() = default; - IsoDropTarget( wxWindow* parent ) : wxFileDropTarget() - { - m_WindowBound = parent; - } - - virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames); -}; - - -extern wxString GetMsg_ConfirmSysReset(); -extern wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, const wxString& isoFilename, const wxString& descpart1 ); diff --git a/pcsx2/gui/MSWstuff.cpp b/pcsx2/gui/MSWstuff.cpp deleted file mode 100644 index cb80736c78..0000000000 --- a/pcsx2/gui/MSWstuff.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "MSWstuff.h" - -#ifdef __WXMSW__ -# include // needed for OutputDebugString -#endif - -void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter ) -{ -#ifdef __WXMSW__ - SetWindowPos( (HWND)hwnd, (HWND)hwndAfter, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE ); -#endif -} - -// Text scales automatically on Windows but that's about it. The dialog widths -// and images need to be scaled manually. -float MSW_GetDPIScale() -{ -#ifdef __WXMSW__ - HDC screen = GetDC(0); - float scale = GetDeviceCaps(screen, LOGPIXELSX) / 96.0; // 96.0 dpi = 100% scale - ReleaseDC(NULL, screen); - - return scale; -#else - return 1.0; -#endif -} diff --git a/pcsx2/gui/MSWstuff.h b/pcsx2/gui/MSWstuff.h deleted file mode 100644 index 4779c37650..0000000000 --- a/pcsx2/gui/MSWstuff.h +++ /dev/null @@ -1,21 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -// FIXME: Missing some includes. -extern void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter ); -extern void MSW_OutputDebugString( const wxString& text ); -extern float MSW_GetDPIScale(); diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp deleted file mode 100644 index a75fa85f5c..0000000000 --- a/pcsx2/gui/MainFrame.cpp +++ /dev/null @@ -1,819 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "MainFrame.h" -#include "AppSaveStates.h" -#include "ConsoleLogger.h" -#include "MSWstuff.h" - -#include "Dialogs/ModalPopups.h" -#include "IsoDropTarget.h" - -#include "fmt/core.h" -#include - -#include -#include "AppAccelerators.h" - -#include "svnrev.h" -#include "Saveslots.h" - -#include "Recording/InputRecording.h" -#include "Recording/InputRecordingControls.h" - -// ------------------------------------------------------------------------ -wxMenu* MainEmuFrame::MakeStatesSubMenu(int baseid, int loadBackupId) const -{ - wxMenu* mnuSubstates = new wxMenu(); - - for (int i = 0; i < 10; i++) - { - // Will be changed once an iso is loaded. - wxMenuItem* m = mnuSubstates->Append(baseid + i + 1, wxsFormat(_("Slot %d"), i), wxEmptyString, wxITEM_CHECK); - m->Check(i == 0); // 0 is the default selected slot - } - - if (loadBackupId >= 0) - { - mnuSubstates->AppendSeparator(); - - wxMenuItem* m = mnuSubstates->Append(loadBackupId, _("Backup")); - m->Enable(false); - } - // Implement custom hotkeys (F2) + (Shift + F2) with translatable string intact + not blank in GUI. - // baseid in the negatives will order in a different section, so if you want to increase more slots you can still easily do this, as -1 it will have the same function as opening file for savestates, which is bad - // For safety i also made them inactive aka grayed out to signify that's it's only for informational purposes - // Fixme: In the future this can still be expanded to actually cycle savestates in the GUI. - mnuSubstates->Append(baseid - 1, _("File...")); - wxMenuItem* CycleNext = mnuSubstates->Append(baseid - 2, _("Cycle to next slot") + wxString("\t") + wxGetApp().GlobalAccels->findKeycodeWithCommandId("States_CycleSlotForward").toTitleizedString()); - CycleNext->Enable(false); - wxMenuItem* CycleBack = mnuSubstates->Append(baseid - 3, _("Cycle to previous slot") + wxString("\t") + wxGetApp().GlobalAccels->findKeycodeWithCommandId("States_CycleSlotBackward").toTitleizedString()); - CycleBack->Enable(false); - return mnuSubstates; -} - -void MainEmuFrame::UpdateStatusBar() -{ - wxString temp(wxEmptyString); - - if (g_Conf->EnableFastBoot) - temp += "Fast Boot - "; - - if (g_Conf->CdvdSource == CDVD_SourceType::Iso) - temp += "Load: '" + wxFileName(g_Conf->CurrentIso).GetFullName() + "' "; - - m_statusbar.SetStatusText(temp, 0); - - if (g_Conf->EnablePresets) - m_statusbar.SetStatusText(wxString::Format(L"P:%d", g_Conf->PresetIndex + 1), 1); - else - m_statusbar.SetStatusText("---", 1); - - m_statusbar.SetStatusText(CDVD_SourceLabels[enum_cast(g_Conf->CdvdSource)], 2); - - m_statusbar.SetStatusText("x64", 3); -} - -void MainEmuFrame::UpdateCdvdSrcSelection() -{ - MenuIdentifiers cdsrc = MenuId_Src_Iso; - - switch (g_Conf->CdvdSource) - { - case CDVD_SourceType::Iso: - cdsrc = MenuId_Src_Iso; - break; - case CDVD_SourceType::Disc: - cdsrc = MenuId_Src_Disc; - break; - case CDVD_SourceType::NoDisc: - cdsrc = MenuId_Src_NoDisc; - break; - - jNO_DEFAULT - } - sMenuBar.Check(cdsrc, true); - ApplyCDVDStatus(); - UpdateStatusBar(); -} - -bool MainEmuFrame::Destroy() -{ - // Sigh: wxWidgets doesn't issue Destroy() calls for children windows when the parent - // is destroyed (it just deletes them, quite suddenly). So let's do it for them, since - // our children have configuration stuff they like to do when they're closing. - - for ( - wxWindowList::const_iterator - i = wxTopLevelWindows.begin(), - end = wxTopLevelWindows.end(); - i != end; ++i) - { - wxTopLevelWindow* const win = wx_static_cast(wxTopLevelWindow*, *i); - if (win == this) - continue; - if (win->GetParent() != this) - continue; - - win->Destroy(); - } - - return _parent::Destroy(); -} - -// ------------------------------------------------------------------------ -// MainFrame OnEvent Handlers -// ------------------------------------------------------------------------ - -// Close out the console log windows along with the main emu window. -// Note: This event only happens after a close event has occurred and was *not* veto'd. Ie, -// it means it's time to provide an unconditional closure of said window. -// -void MainEmuFrame::OnCloseWindow(wxCloseEvent& evt) -{ - // the main thread is busy suspending everything, so let's not try to call it - // when closing the emulator - //init_gspanel = false; - - if (IsBeingDeleted()) - return; - - CoreThread.Suspend(); - - //bool isClosing = false; - - if (!evt.CanVeto()) - { - // Mandatory destruction... - //isClosing = true; - } - else - { - // TODO : Add confirmation prior to exit here! - // Problem: Suspend is often slow because it needs to wait until the current EE frame - // has finished processing (if the GS or logging has incurred severe overhead this makes - // closing PCSX2 difficult). A non-blocking suspend with modal dialog might suffice - // however. --air - - //evt.Veto( true ); - } - - sApp.OnMainFrameClosed(GetId()); - - RemoveCdvdMenu(); - - RemoveEventHandler(&wxGetApp().GetRecentIsoManager()); - wxGetApp().PostIdleAppMethod(&Pcsx2App::PrepForExit); - - evt.Skip(); -} - -void MainEmuFrame::OnMoveAround(wxMoveEvent& evt) -{ - if (IsBeingDeleted() || !IsVisible() || IsIconized()) - return; - - // Uncomment this when doing logger stress testing (and then move the window around - // while the logger spams itself) - // ... makes for a good test of the message pump's responsiveness. - if (EnableThreadedLoggingTest) - Console.Warning("Threaded Logging Test! (a window move event)"); - - // evt.GetPosition() returns the client area position, not the window frame position. - // So read the window's screen-relative position directly. - g_Conf->MainGuiPosition = GetScreenPosition(); - - // wxGTK note: X sends gratuitous amounts of OnMove messages for various crap actions - // like selecting or deselecting a window, which muck up docking logic. We filter them - // out using 'lastpos' here. :) - - static wxPoint lastpos(wxDefaultCoord, wxDefaultCoord); - if (lastpos == evt.GetPosition()) - return; - lastpos = evt.GetPosition(); - - if (g_Conf->ProgLogBox.AutoDock) - { - if (ConsoleLogFrame* proglog = wxGetApp().GetProgramLog()) - { - if (!proglog->IsMaximized()) - { - g_Conf->ProgLogBox.DisplayPosition = GetRect().GetTopRight(); - proglog->SetPosition(g_Conf->ProgLogBox.DisplayPosition); - } - } - } - - evt.Skip(); -} - -void MainEmuFrame::OnLogBoxHidden() -{ - g_Conf->ProgLogBox.Visible = false; - m_MenuItem_Console.Check(false); -} - -// ------------------------------------------------------------------------ -void MainEmuFrame::ConnectMenus() -{ - // System - Bind(wxEVT_MENU, &MainEmuFrame::Menu_BootCdvd_Click, this, MenuId_Boot_CDVD); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_FastBoot_Click, this, MenuId_Config_FastBoot); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_OpenELF_Click, this, MenuId_Boot_ELF); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_SuspendResume_Click, this, MenuId_Sys_SuspendResume); - - Bind(wxEVT_MENU, &MainEmuFrame::Menu_LoadStates_Click, this, MenuId_State_Load01 + 1, MenuId_State_Load01 + 10); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_LoadStates_Click, this, MenuId_State_LoadBackup); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_LoadStateFromFile_Click, this, MenuId_State_LoadFromFile); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_SaveStates_Click, this, MenuId_State_Save01 + 1, MenuId_State_Save01 + 10); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_SaveStateToFile_Click, this, MenuId_State_SaveToFile); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_EnableBackupStates_Click, this, MenuId_EnableBackupStates); - - Bind(wxEVT_MENU, &MainEmuFrame::Menu_EnablePatches_Click, this, MenuId_EnablePatches); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_EnableCheats_Click, this, MenuId_EnableCheats); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_PINE_Enable_Click, this, MenuId_PINE_Enable); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_PINE_Settings_Click, this, MenuId_PINE_Settings); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_EnableWideScreenPatches_Click, this, MenuId_EnableWideScreenPatches); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_EnableRecordingTools_Click, this, MenuId_EnableInputRecording); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_EnableHostFs_Click, this, MenuId_EnableHostFs); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_SysShutdown_Click, this, MenuId_Sys_Shutdown); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Exit_Click, this, MenuId_Exit); - - // CDVD - Bind(wxEVT_MENU, &MainEmuFrame::Menu_IsoBrowse_Click, this, MenuId_IsoBrowse); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_IsoClear_Click, this, MenuId_IsoClear); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_IsoClearMissing_Click, this, MenuId_IsoClearMissing); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_CdvdSource_Click, this, MenuId_Src_Iso); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_CdvdSource_Click, this, MenuId_Src_Disc); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_CdvdSource_Click, this, MenuId_Src_NoDisc); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Ask_On_Boot_Click, this, MenuId_Ask_On_Booting); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Debug_CreateBlockdump_Click, this, MenuId_Debug_CreateBlockdump); - - // Config - Bind(wxEVT_MENU, &MainEmuFrame::Menu_SysSettings_Click, this, MenuId_Config_SysSettings); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_McdSettings_Click, this, MenuId_Config_McdSettings); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_AudioSettings_Click, this, MenuId_Config_SPU2); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_NetworkSettings_Click, this, MenuId_Config_DEV9); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_USBSettings_Click, this, MenuId_Config_USB); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_PADSettings_Click, this, MenuId_Config_PAD); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_GSSettings_Click, this, MenuId_Config_GS); - - Bind(wxEVT_MENU, &MainEmuFrame::Menu_GSSettings_Click, this, MenuId_Video_CoreSettings); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_WindowSettings_Click, this, MenuId_Video_WindowSettings); - - Bind(wxEVT_MENU, &MainEmuFrame::Menu_MultitapToggle_Click, this, MenuId_Config_Multitap0Toggle); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_MultitapToggle_Click, this, MenuId_Config_Multitap1Toggle); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_ResetAllSettings_Click, this, MenuId_Config_ResetAll); - - // Misc - Bind(wxEVT_MENU, &MainEmuFrame::Menu_ShowConsole, this, MenuId_Console); -#if defined(__POSIX__) - Bind(wxEVT_MENU, &MainEmuFrame::Menu_ShowConsole_Stdio, this, MenuId_Console_Stdio); -#endif - - Bind(wxEVT_MENU, &MainEmuFrame::Menu_GetStarted, this, MenuId_Help_GetStarted); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Compatibility, this, MenuId_Help_Compatibility); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Forums, this, MenuId_Help_Forums); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Website, this, MenuId_Help_Website); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Github, this, MenuId_Help_Github); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Wiki, this, MenuId_Help_Wiki); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_ShowAboutBox, this, MenuId_About); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_ShowGSDump, this, MenuId_GSDump); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_ChangeLang, this, MenuId_ChangeLang); - - // Debug - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Debug_Open_Click, this, MenuId_Debug_Open); - - // Capture - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Video_ToggleCapture_Click, this, MenuId_Capture_Video_Record); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Video_ToggleCapture_Click, this, MenuId_Capture_Video_Stop); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Video_IncludeAudio_Click, this, MenuId_Capture_Video_IncludeAudio); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Screenshot_Screenshot_Click, this, MenuId_Capture_Screenshot_Screenshot); - Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Screenshot_Screenshot_As_Click, this, MenuId_Capture_Screenshot_Screenshot_As); -} - -void MainEmuFrame::InitLogBoxPosition(AppConfig::ConsoleLogOptions& conf) -{ - conf.DisplaySize.Set( - std::min(std::max(conf.DisplaySize.GetWidth(), 160), wxGetDisplayArea().GetWidth()), - std::min(std::max(conf.DisplaySize.GetHeight(), 160), wxGetDisplayArea().GetHeight())); - - if (conf.AutoDock) - { - conf.DisplayPosition = GetScreenPosition() + wxSize(GetSize().x, 0); - } - else if (conf.DisplayPosition != wxDefaultPosition) - { - if (!wxGetDisplayArea().Contains(wxRect(conf.DisplayPosition, conf.DisplaySize))) - conf.DisplayPosition = wxDefaultPosition; - } -} - -void MainEmuFrame::DispatchEvent(const CoreThreadStatus& status) -{ - if (!pxAssertMsg(GetMenuBar() != NULL, "Mainframe menu bar is NULL!")) - return; - ApplySuspendStatus(); -} - -void MainEmuFrame::AppStatusEvent_OnSettingsApplied() -{ - ApplySettings(); -} - -void MainEmuFrame::CreatePcsx2Menu() -{ - // ------------------------------------------------------------------------ - // Some of the items in the System menu are configured by the UpdateCoreStatus() method. - - m_menuSys.Append(MenuId_Boot_CDVD, _("Initializing...")); - - m_menuSys.Append(MenuId_Sys_SuspendResume, _("Initializing...")); - - m_menuSys.Append(MenuId_Sys_Shutdown, _("Shut&down"), - _("Wipes all internal VM states.")); - m_menuSys.FindItem(MenuId_Sys_Shutdown)->Enable(false); - - m_menuSys.Append(MenuId_Boot_ELF, _("&Run ELF..."), - _("For running raw PS2 binaries directly.")); - - m_menuSys.AppendSeparator(); - - m_menuSys.Append(MenuId_Config_FastBoot, _("Fast Boot"), - _("Skips PS2 splash screens when booting from ISO or DVD media"), wxITEM_CHECK); - - m_menuSys.Append(MenuId_GameSettingsSubMenu, _("&Game Settings"), &m_GameSettingsSubmenu); - - m_GameSettingsSubmenu.Append(MenuId_EnablePatches, _("Automatic &Gamefixes"), - _("Automatically applies needed Gamefixes to known problematic games."), wxITEM_CHECK); - - m_GameSettingsSubmenu.Append(MenuId_EnableCheats, _("Enable &Cheats"), - _("Use cheats otherwise known as pnachs from the cheats folder."), wxITEM_CHECK); - - m_GameSettingsSubmenu.Append(MenuId_PINE, _("Configure &PINE"), &m_submenuPINE); - - m_submenuPINE.Append(MenuId_PINE_Enable, _("&Enable PINE"), - wxEmptyString, wxITEM_CHECK); - - m_submenuPINE.Append(MenuId_PINE_Settings, _("PINE &Settings")); - - m_GameSettingsSubmenu.Append(MenuId_EnableWideScreenPatches, _("Enable &Widescreen Patches"), - _("Enabling Widescreen Patches may occasionally cause issues."), wxITEM_CHECK); - - m_GameSettingsSubmenu.Append(MenuId_EnableInputRecording, _("Enable &Input Recording"), - _("Input Recording for controller/keyboard presses, tools for automation and playback."), wxITEM_NORMAL); - - m_GameSettingsSubmenu.Append(MenuId_EnableHostFs, _("Enable &Host Filesystem"), - wxEmptyString, wxITEM_CHECK); - - m_menuSys.AppendSeparator(); - // Implement custom hotkeys (F3) with translatable string intact + not blank in GUI. - wxMenuItem* sysLoadStateItem = m_menuSys.Append(MenuId_Sys_LoadStates, _("&Load state"), &m_LoadStatesSubmenu); - AppendShortcutToMenuOption(*sysLoadStateItem, wxGetApp().GlobalAccels->findKeycodeWithCommandId("States_DefrostCurrentSlot").toTitleizedString()); - // Implement custom hotkeys (F1) with translatable string intact + not blank in GUI. - wxMenuItem* sysSaveStateItem = m_menuSys.Append(MenuId_Sys_SaveStates, _("&Save state"), &m_SaveStatesSubmenu); - AppendShortcutToMenuOption(*sysSaveStateItem, wxGetApp().GlobalAccels->findKeycodeWithCommandId("States_FreezeCurrentSlot").toTitleizedString()); - - m_menuSys.Append(MenuId_EnableBackupStates, _("&Backup before save"), wxEmptyString, wxITEM_CHECK); - - m_menuSys.AppendSeparator(); - - m_menuSys.Append(MenuId_Exit, _("E&xit"), - AddAppName(_("Closing %s may be hazardous to your health."))); -} - -void MainEmuFrame::CreateCdvdMenu() -{ - // ------------------------------------------------------------------------ - wxMenu& isoRecents(wxGetApp().GetRecentIsoMenu()); - wxMenu& driveList(wxGetApp().GetDriveListMenu()); - - m_menuItem_RecentIsoMenu = m_menuCDVD.AppendSubMenu(&isoRecents, _("ISO &Selector")); - m_menuItem_DriveListMenu = m_menuCDVD.AppendSubMenu(&driveList, _("D&rive Selector")); - - m_menuCDVD.AppendSeparator(); - m_menuCDVD.Append(MenuId_Src_Iso, _("&ISO"), _("Makes the specified ISO image the CDVD source."), wxITEM_RADIO); - m_menuCDVD.Append(MenuId_Src_Disc, _("&Disc"), _("Uses a disc drive as the CDVD source."), wxITEM_RADIO); - m_menuCDVD.Append(MenuId_Src_NoDisc, _("&No disc"), _("Use this to boot into your virtual PS2's BIOS configuration."), wxITEM_RADIO); - -#if defined(__FREEBSD__) || defined(__APPLE__) - m_menuItem_DriveListMenu->Enable(false); - m_menuCDVD.Enable(MenuId_Src_Disc, false); -#endif -} - - -void MainEmuFrame::CreateConfigMenu() -{ - m_menuConfig.Append(MenuId_Config_SysSettings, _("General &Settings")); - m_menuConfig.Append(MenuId_Config_McdSettings, _("&Memory Cards")); - m_menuConfig.AppendSeparator(); - m_menuConfig.Append(MenuId_Config_GS, _("&Graphics Settings")); - m_menuConfig.Append(MenuId_Config_SPU2, _("&Audio Settings")); - m_menuConfig.Append(MenuId_Config_PAD, _("Game&pad Settings")); - m_menuConfig.Append(MenuId_Config_DEV9, _("&Network and HDD Settings")); - m_menuConfig.Append(MenuId_Config_USB, _("&USB Settings")); - m_menuConfig.AppendSeparator(); - - m_menuConfig.Append(MenuId_Config_Multitap0Toggle, _("Multitap &1"), wxEmptyString, wxITEM_CHECK); - m_menuConfig.Append(MenuId_Config_Multitap1Toggle, _("Multitap &2"), wxEmptyString, wxITEM_CHECK); - - m_menuConfig.AppendSeparator(); - - m_menuConfig.Append(MenuId_ChangeLang, L"Change &Language"); // Always in English - m_menuConfig.Append(MenuId_Config_ResetAll, _("&Clear All Settings"), - AddAppName(_("Clears all %s settings and re-runs the startup wizard."))); -} - -void MainEmuFrame::CreateWindowsMenu() -{ - m_menuWindow.Append(MenuId_Debug_CreateBlockdump, _("Create &Blockdump"), _("Creates a block dump for debugging purposes."), wxITEM_CHECK); - m_menuWindow.Append(MenuId_Debug_Open, _("&Show Debugger"), wxEmptyString, wxITEM_CHECK); - -#ifndef PCSX2_CI - if (IsDevBuild || g_Conf->DevMode) -#endif - m_menuWindow.Append(MenuId_GSDump, _("Show &GS Debugger")); - - m_menuWindow.Append(&m_MenuItem_Console); -#if defined(__POSIX__) - m_menuWindow.AppendSeparator(); - m_menuWindow.Append(&m_MenuItem_Console_Stdio); -#endif -} - -void MainEmuFrame::CreateCaptureMenu() -{ - m_menuCapture.Append(MenuId_Capture_Video, _("Video"), &m_submenuVideoCapture); - // Implement custom hotkeys (F12) with translatable string intact + not blank in GUI. - wxMenuItem* sysVideoCaptureItem = m_submenuVideoCapture.Append(MenuId_Capture_Video_Record, _("Start Video Capture")); - AppendShortcutToMenuOption(*sysVideoCaptureItem, wxGetApp().GlobalAccels->findKeycodeWithCommandId("Sys_RecordingToggle").toTitleizedString()); - sysVideoCaptureItem = m_submenuVideoCapture.Append(MenuId_Capture_Video_Stop, _("Stop Video Capture")); - sysVideoCaptureItem->Enable(false); - AppendShortcutToMenuOption(*sysVideoCaptureItem, wxGetApp().GlobalAccels->findKeycodeWithCommandId("Sys_RecordingToggle").toTitleizedString()); - m_submenuVideoCapture.AppendSeparator(); - m_submenuVideoCapture.Append(MenuId_Capture_Video_IncludeAudio, _("Include Audio"), - _("Enables/disables the creation of a synchronized wav audio file when capturing video footage."), wxITEM_CHECK); - // Implement custom hotkeys (F8) + (Shift + F8) + (Ctrl + Shift + F8) with translatable string intact + not blank in GUI. - // Fixme: GlobalCommands.cpp L1029-L1031 is having issues because FrameForGS already maps the hotkey first. - // Fixme: When you uncomment L1029-L1031 on that file; Linux says that Ctrl is already used for something else and will append (Shift + F8) while Windows will (Ctrl + Shift + F8) - m_menuCapture.Append(MenuId_Capture_Screenshot, _("Screenshot"), &m_submenuScreenshot); - wxMenuItem* sysScreenShotItem = m_submenuScreenshot.Append(MenuId_Capture_Screenshot_Screenshot, _("Take Screenshot")); - // HACK: in AcceleratorDictionary::Map the Sys_TakeSnapshot entry gets Shift and Cmd (Ctrl) hardcoded to it because it is similarly hardcoded in GS - // So... remove such modifiers as the GUI menu entry is only for the base keybinding without modifiers. - // We can be confident in doing so, as if a user adds these modifiers themselves, the same function rejects it. - KeyAcceleratorCode keyCode = wxGetApp().GlobalAccels->findKeycodeWithCommandId("Sys_TakeSnapshot"); - keyCode.Shift(false); - keyCode.Cmd(false); - AppendShortcutToMenuOption(*sysScreenShotItem, keyCode.toTitleizedString()); - m_submenuScreenshot.Append(MenuId_Capture_Screenshot_Screenshot_As, _("Save Screenshot As...")); -} - -void MainEmuFrame::CreateInputRecordingMenu() -{ - m_menuRecording.Append(MenuId_Recording_New, _("New"), _("Create a new input recording."))->Enable(false); - m_menuRecording.Append(MenuId_Recording_Stop, _("Stop"), _("Stop the active input recording."))->Enable(false); - m_menuRecording.Append(MenuId_Recording_Play, _("Play"), _("Playback an existing input recording."))->Enable(false); - m_menuRecording.AppendSeparator(); - - m_menuRecording.Append(MenuId_Recording_Settings, _("Settings"), &m_submenu_recording_settings); - wxString frame_advance_label = wxString(_("Configure Frame Advance")); - frame_advance_label.Append(wxString::Format(" (%d)", g_Conf->inputRecording.m_frame_advance_amount)); - m_submenu_recording_settings.Append(MenuId_Recording_Config_FrameAdvance, frame_advance_label, _("Change the amount of frames advanced each time")); - m_menuRecording.AppendSeparator(); - - m_menuRecording.Append(MenuId_Recording_TogglePause, _("Toggle Pause"), _("Pause or resume emulation on the fly."))->Enable(false); - m_menuRecording.Append(MenuId_Recording_FrameAdvance, _("Frame Advance"), _("Advance emulation forward by a single frame at a time."))->Enable(false); - m_menuRecording.Append(MenuId_Recording_ToggleRecordingMode, _("Toggle Recording Mode"), _("Save/playback inputs to/from the recording file."))->Enable(false); - m_menuRecording.AppendSeparator(); - - m_menuRecording.Append(MenuId_Recording_VirtualPad_Port0, _("Virtual Pad (Port 1)")); - m_menuRecording.Append(MenuId_Recording_VirtualPad_Port1, _("Virtual Pad (Port 2)")); -} - -void MainEmuFrame::CreateHelpMenu() -{ - m_menuHelp.Append(MenuId_Help_GetStarted, _("&Getting Started")); - m_menuHelp.Append(MenuId_Help_Compatibility, _("&Compatibility")); - m_menuHelp.AppendSeparator(); - m_menuHelp.Append(MenuId_Help_Website, _("&Website")); - m_menuHelp.Append(MenuId_Help_Wiki, _("&Wiki")); - m_menuHelp.Append(MenuId_Help_Forums, _("&Support Forums")); - m_menuHelp.Append(MenuId_Help_Github, _("&GitHub Repository")); - m_menuHelp.AppendSeparator(); - m_menuHelp.Append(MenuId_About, _("&About")); -} - -// ------------------------------------------------------------------------ -MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) - : wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER)) - - , m_statusbar(*CreateStatusBar(2, 0)) - , m_background(new wxStaticBitmap(this, wxID_ANY, wxGetApp().GetLogoBitmap())) - - // All menu components must be created on the heap! - - , m_menubar(*new wxMenuBar()) - - , m_menuCDVD(*new wxMenu()) - , m_menuSys(*new wxMenu()) - , m_menuConfig(*new wxMenu()) - , m_menuWindow(*new wxMenu()) - , m_menuCapture(*new wxMenu()) - , m_submenuVideoCapture(*new wxMenu()) - , m_submenuPINE(*new wxMenu()) - , m_submenuScreenshot(*new wxMenu()) - , m_menuRecording(*new wxMenu()) - , m_submenu_recording_settings(*new wxMenu()) - , m_menuHelp(*new wxMenu()) - , m_LoadStatesSubmenu(*MakeStatesSubMenu(MenuId_State_Load01, MenuId_State_LoadBackup)) - , m_SaveStatesSubmenu(*MakeStatesSubMenu(MenuId_State_Save01)) - , m_GameSettingsSubmenu(*new wxMenu()) - - , m_MenuItem_Console(*new wxMenuItem(&m_menuWindow, MenuId_Console, _("&Show Program Log"), wxEmptyString, wxITEM_CHECK)) -#if defined(__POSIX__) - , m_MenuItem_Console_Stdio(*new wxMenuItem(&m_menuWindow, MenuId_Console_Stdio, _("&Program Log to Stdio"), wxEmptyString, wxITEM_CHECK)) -#endif - -{ - m_RestartEmuOnDelete = false; - m_capturingVideo = false; - - // ------------------------------------------------------------------------ - // Initial menubar setup. This needs to be done first so that the menu bar's visible size - // can be factored into the window size (which ends up being background+status+menus) - - m_menubar.Append(&m_menuSys, _("&System")); - m_menubar.Append(&m_menuCDVD, _("CD&VD")); - m_menubar.Append(&m_menuConfig, _("&Config")); - m_menubar.Append(&m_menuWindow, _("&Debug")); - m_menubar.Append(&m_menuCapture, _("Captu&re")); - - SetMenuBar(&m_menubar); - - m_menubar.Append(&m_menuHelp, _("&Help")); - - // ------------------------------------------------------------------------ - - // The background logo and its window size are different on Windows. Use the - // background logo size, which is what it'll eventually be resized to. - wxSize backsize(m_background->GetBitmap().GetWidth(), m_background->GetBitmap().GetHeight()); - - wxString wintitle; - if (PCSX2_isReleaseVersion) - { - // stable releases, with a simple title. - wintitle.Printf(L"%s %d.%d.%d", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo); - } - else if (GIT_TAGGED_COMMIT) // Nightly builds - { - // tagged commit - more modern implementation of dev build versioning - // - there is no need to include the commit - that is associated with the tag, git is implied - wintitle.Printf(L"%s Nightly - %s", pxGetAppName().c_str(), GIT_TAG); - } - else - { - // beta / development editions, which feature revision number and compile date. - if (strlen(GIT_REV) > 5) - { - wintitle.Printf(L"%s %s", pxGetAppName().c_str(), GIT_REV); - } - else - { - wintitle.Printf(L"%s %d.%d.%d-%lld (git)", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, - PCSX2_VersionLo, SVN_REV); - } - } - - SetTitle(wintitle); - - // Ideally the __WXMSW__ port should use the embedded IDI_ICON2 icon, because wxWidgets sucks and - // loses the transparency information when loading bitmaps into icons. But for some reason - // I cannot get it to work despite following various examples to the letter. - SetIcons(wxGetApp().GetIconBundle()); - - int m_statusbar_widths[] = {(int)-20, (int)-3, (int)-3, (int)-3}; - m_statusbar.SetFieldsCount(4); - m_statusbar.SetStatusWidths(4, m_statusbar_widths); - m_statusbar.SetStatusText(wxEmptyString, 0); - - wxBoxSizer& joe(*new wxBoxSizer(wxVERTICAL)); - joe.Add(m_background); - SetSizerAndFit(&joe); - - // Makes no sense, but this is needed for the window size to be correct for - // 200% DPI on Windows. The SetSizerAndFit is supposed to be doing the exact - // same thing. - GetSizer()->SetSizeHints(this); - - // Use default window position if the configured windowpos is invalid (partially offscreen) - if (g_Conf->MainGuiPosition == wxDefaultPosition || !pxIsValidWindowPosition(*this, g_Conf->MainGuiPosition)) - g_Conf->MainGuiPosition = GetScreenPosition(); - else - SetPosition(g_Conf->MainGuiPosition); - - // Updating console log positions after the main window has been fitted to its sizer ensures - // proper docked positioning, since the main window's size is invalid until after the sizer - // has been set/fit. - - InitLogBoxPosition(g_Conf->ProgLogBox); - CreatePcsx2Menu(); - CreateCdvdMenu(); - CreateConfigMenu(); - CreateWindowsMenu(); - CreateCaptureMenu(); - CreateInputRecordingMenu(); - CreateHelpMenu(); - - m_MenuItem_Console.Check(g_Conf->ProgLogBox.Visible); - - ConnectMenus(); - Bind(wxEVT_MOVE, &MainEmuFrame::OnMoveAround, this); - Bind(wxEVT_CLOSE_WINDOW, &MainEmuFrame::OnCloseWindow, this); - Bind(wxEVT_SET_FOCUS, &MainEmuFrame::OnFocus, this); - Bind(wxEVT_ACTIVATE, &MainEmuFrame::OnActivate, this); - - PushEventHandler(&wxGetApp().GetRecentIsoManager()); - SetDropTarget(new IsoDropTarget(this)); - - ApplyCoreStatus(); - ApplySettings(); -} - -MainEmuFrame::~MainEmuFrame() -{ - try - { - if (m_RestartEmuOnDelete) - { - sApp.SetExitOnFrameDelete(false); - sApp.PostAppMethod(&Pcsx2App::DetectCpuAndUserMode); - sApp.WipeUserModeSettings(); - } - } - DESTRUCTOR_CATCHALL -} - -void MainEmuFrame::DoGiveHelp(const wxString& text, bool show) -{ - _parent::DoGiveHelp(text, show); - wxGetApp().GetProgramLog()->DoGiveHelp(text, show); -} - -// ---------------------------------------------------------------------------- -// OnFocus / OnActivate : Special implementation to "connect" the console log window -// with the main frame window. When one is clicked, the other is assured to be brought -// to the foreground with it. (Currently only MSW only, as wxWidgets appears to have no -// equivalent to this). Both OnFocus and OnActivate are handled because Focus events do -// not propagate up the window hierarchy, and on Activate events don't always get sent -// on the first focusing event after PCSX2 starts. - -void MainEmuFrame::OnFocus(wxFocusEvent& evt) -{ - if (ConsoleLogFrame* logframe = wxGetApp().GetProgramLog()) - MSW_SetWindowAfter(logframe->GetHandle(), GetHandle()); - - evt.Skip(); -} - -void MainEmuFrame::OnActivate(wxActivateEvent& evt) -{ - if (ConsoleLogFrame* logframe = wxGetApp().GetProgramLog()) - MSW_SetWindowAfter(logframe->GetHandle(), GetHandle()); - - evt.Skip(); -} -// ---------------------------------------------------------------------------- - -void MainEmuFrame::ApplyCoreStatus() -{ - ApplySuspendStatus(); - ApplyCDVDStatus(); -} - -void MainEmuFrame::ApplySuspendStatus() -{ - // [TODO] : Ideally each of these items would bind a listener instance to the AppCoreThread - // dispatcher, and modify their states accordingly. This is just a hack (for now) -- air - - if (wxMenuItem* susres = GetMenuBar()->FindItem(MenuId_Sys_SuspendResume)) - { - if (!CoreThread.IsClosing()) - { - susres->Enable(); - susres->SetItemLabel(_("Paus&e")); - susres->SetHelp(_("Safely pauses emulation and preserves the PS2 state.")); - } - else - { - bool ActiveVM = SysHasValidState(); - susres->Enable(ActiveVM); - if (ActiveVM) - { - susres->SetItemLabel(_("R&esume")); - susres->SetHelp(_("Resumes the suspended emulation state.")); - } - else - { - susres->SetItemLabel(_("Pause/Resume")); - susres->SetHelp(_("No emulation state is active; cannot suspend or resume.")); - } - } - // Re-init keybinding after changing the label. - AppendShortcutToMenuOption(*susres, wxGetApp().GlobalAccels->findKeycodeWithCommandId("Sys_SuspendResume").toTitleizedString()); - } -} - -void MainEmuFrame::ApplyCDVDStatus() -{ - const CDVD_SourceType Source = g_Conf->CdvdSource; - - wxMenuItem* cdvd_menu = GetMenuBar()->FindItem(MenuId_Boot_CDVD); - - wxString label; - wxString help_text = _("Use fast boot to skip PS2 startup and splash screens."); - - switch (Source) - { - case CDVD_SourceType::Iso: - label = _("Boot ISO"); - break; - case CDVD_SourceType::Disc: - label = _("Boot CDVD"); - break; - case CDVD_SourceType::NoDisc: - label = _("Boot BIOS"); - break; - default: - label = _("Boot BIOS"); - break; - } - - cdvd_menu->SetItemLabel(label); - cdvd_menu->SetHelp(help_text); -} - -//Apply a config to the menu such that the menu reflects it properly -void MainEmuFrame::ApplySettings() -{ - ApplyConfigToGui(*g_Conf); -} - -//MainEmuFrame needs to be aware which items are affected by presets if AppConfig::APPLY_FLAG_FROM_PRESET is on. -//currently only EnablePatches is affected when the settings come from a preset. -void MainEmuFrame::ApplyConfigToGui(AppConfig& configToApply, int flags) -{ - wxMenuBar& menubar(*GetMenuBar()); - - menubar.Check(MenuId_EnablePatches, configToApply.EmuOptions.EnablePatches); - menubar.Enable(MenuId_EnablePatches, !configToApply.EnablePresets); - - if (!(flags & AppConfig::APPLY_FLAG_FROM_PRESET)) - { //these should not be affected by presets - menubar.Check(MenuId_EnableBackupStates, configToApply.EmuOptions.BackupSavestate); - menubar.Check(MenuId_EnableCheats, configToApply.EmuOptions.EnableCheats); - menubar.Check(MenuId_PINE_Enable, configToApply.EmuOptions.EnablePINE); - menubar.Check(MenuId_EnableWideScreenPatches, configToApply.EmuOptions.EnableWideScreenPatches); - menubar.Check(MenuId_Capture_Video_IncludeAudio, configToApply.AudioCapture.EnableAudio); - - menubar.Check(MenuId_EnableHostFs, configToApply.EmuOptions.HostFs); - menubar.Check(MenuId_Debug_CreateBlockdump, configToApply.EmuOptions.CdvdDumpBlocks); -#if defined(__POSIX__) - menubar.Check(MenuId_Console_Stdio, configToApply.EmuOptions.ConsoleToStdio); -#endif - - menubar.Check(MenuId_Config_Multitap0Toggle, configToApply.EmuOptions.MultitapPort0_Enabled); - menubar.Check(MenuId_Config_Multitap1Toggle, configToApply.EmuOptions.MultitapPort1_Enabled); - menubar.Check(MenuId_Config_FastBoot, configToApply.EnableFastBoot); - } - - UpdateCdvdSrcSelection(); //shouldn't be affected by presets but updates from g_Conf anyway and not from configToApply, so no problem here. -} - -//write pending preset settings from the gui to g_Conf, -// without triggering an overall "settingsApplied" event. -void MainEmuFrame::CommitPreset_noTrigger() -{ - wxMenuBar& menubar(*GetMenuBar()); - g_Conf->EmuOptions.EnablePatches = menubar.IsChecked(MenuId_EnablePatches); -} - -void MainEmuFrame::AppendShortcutToMenuOption(wxMenuItem& item, wxString keyCodeStr) -{ - wxString text = item.GetItemLabel(); - const size_t tabPos = text.rfind(L'\t'); - item.SetItemLabel(text.Mid(0, tabPos) + L"\t" + keyCodeStr); -} diff --git a/pcsx2/gui/MainFrame.h b/pcsx2/gui/MainFrame.h deleted file mode 100644 index 615013ad61..0000000000 --- a/pcsx2/gui/MainFrame.h +++ /dev/null @@ -1,216 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "App.h" -#include "AppSaveStates.h" - -#include -#include - -// -------------------------------------------------------------------------------------- -// InvokeMenuCommand_OnSysStateUnlocked -// -------------------------------------------------------------------------------------- -class InvokeMenuCommand_OnSysStateUnlocked - : public IEventListener_SysState, - public BaseDeletableObject -{ -protected: - MenuIdentifiers m_menu_cmd; - -public: - InvokeMenuCommand_OnSysStateUnlocked(MenuIdentifiers menu_command) - { - m_menu_cmd = menu_command; - } - - virtual ~InvokeMenuCommand_OnSysStateUnlocked() = default; - - virtual void SaveStateAction_OnCreateFinished() - { - wxGetApp().PostMenuAction(m_menu_cmd); - } -}; - -// -------------------------------------------------------------------------------------- -// MainEmuFrame -// -------------------------------------------------------------------------------------- -class MainEmuFrame : public wxFrame, - public EventListener_CoreThread, - public EventListener_AppStatus -{ - typedef wxFrame _parent; - -protected: - bool m_RestartEmuOnDelete; - - wxStatusBar& m_statusbar; - wxStaticBitmap* m_background; - - wxMenuBar& m_menubar; - - wxMenu& m_menuCDVD; - wxMenu& m_menuSys; - wxMenu& m_menuConfig; - wxMenu& m_menuWindow; - - wxMenu& m_menuCapture; - wxMenu& m_submenuVideoCapture; - wxMenu& m_submenuPINE; - wxMenu& m_submenuScreenshot; - - wxMenu& m_menuRecording; - wxMenu& m_submenu_recording_settings; - wxMenu& m_menuHelp; - - wxMenu& m_LoadStatesSubmenu; - wxMenu& m_SaveStatesSubmenu; - wxMenu& m_GameSettingsSubmenu; - - wxMenuItem* m_menuItem_RecentIsoMenu; - wxMenuItem* m_menuItem_DriveListMenu; - wxMenuItem& m_MenuItem_Console; -#if defined(__POSIX__) - wxMenuItem& m_MenuItem_Console_Stdio; -#endif - - bool m_capturingVideo; - - virtual void DispatchEvent(const CoreThreadStatus& status); - virtual void AppStatusEvent_OnSettingsApplied(); - -public: - MainEmuFrame(wxWindow* parent, const wxString& title); - virtual ~MainEmuFrame(); - - void OnLogBoxHidden(); - - bool IsPaused() const { return GetMenuBar()->IsChecked(MenuId_Sys_SuspendResume); } - void UpdateCdvdSrcSelection(); - void RemoveCdvdMenu(); - void EnableMenuItem(int id, bool enable); - void CheckMenuItem(int id, bool checked); - void SetMenuItemLabel(int id, wxString str); - - void CreateCdvdMenu(); - void CreatePcsx2Menu(); - void CreateConfigMenu(); - void CreateWindowsMenu(); - void CreateCaptureMenu(); - void CreateInputRecordingMenu(); - void CreateHelpMenu(); - - bool Destroy(); - - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - void CommitPreset_noTrigger(); - void AppendShortcutToMenuOption(wxMenuItem& item, wxString keyCodeStr); - void UpdateStatusBar(); - void VideoCaptureToggle(); - bool IsCapturing() const noexcept { return m_capturingVideo; } - -protected: - void DoGiveHelp(const wxString& text, bool show); - - //Apply here is from config to GUI. - void ApplySettings(); - void ApplyCoreStatus(); - void ApplySuspendStatus(); - void ApplyCDVDStatus(); - - void InitLogBoxPosition(AppConfig::ConsoleLogOptions& conf); - - void OnCloseWindow(wxCloseEvent& evt); - void OnMoveAround(wxMoveEvent& evt); - void OnFocus(wxFocusEvent& evt); - void OnActivate(wxActivateEvent& evt); - - void Menu_SysSettings_Click(wxCommandEvent& event); - void Menu_NetworkSettings_Click(wxCommandEvent& event); - void Menu_AudioSettings_Click(wxCommandEvent& event); - void Menu_USBSettings_Click(wxCommandEvent& event); - void Menu_PADSettings_Click(wxCommandEvent& event); - void Menu_McdSettings_Click(wxCommandEvent& event); - void Menu_WindowSettings_Click(wxCommandEvent& event); - void Menu_GSSettings_Click(wxCommandEvent& event); - void Menu_SelectBios_Click(wxCommandEvent& event); - void Menu_ResetAllSettings_Click(wxCommandEvent& event); - - void Menu_IsoBrowse_Click(wxCommandEvent& event); - void Menu_IsoClear_Click(wxCommandEvent& event); - void Menu_IsoClearMissing_Click(wxCommandEvent& event); - void Menu_EnableBackupStates_Click(wxCommandEvent& event); - void Menu_EnablePatches_Click(wxCommandEvent& event); - void Menu_EnableCheats_Click(wxCommandEvent& event); - void Menu_PINE_Enable_Click(wxCommandEvent& event); - void Menu_PINE_Settings_Click(wxCommandEvent& event); - void Menu_EnableWideScreenPatches_Click(wxCommandEvent& event); - void Menu_EnableRecordingTools_Click(wxCommandEvent& event); - void Menu_EnableHostFs_Click(wxCommandEvent& event); - - void Menu_BootCdvd_Click(wxCommandEvent& event); - void Menu_FastBoot_Click(wxCommandEvent& event); - - void Menu_OpenELF_Click(wxCommandEvent& event); - void Menu_CdvdSource_Click(wxCommandEvent& event); - void Menu_LoadStates_Click(wxCommandEvent& event); - void Menu_SaveStates_Click(wxCommandEvent& event); - void Menu_LoadStateFromFile_Click(wxCommandEvent& event); - void Menu_SaveStateToFile_Click(wxCommandEvent& event); - void Menu_Exit_Click(wxCommandEvent& event); - - void Menu_SuspendResume_Click(wxCommandEvent& event); - void Menu_SysShutdown_Click(wxCommandEvent& event); - - void Menu_MultitapToggle_Click(wxCommandEvent& event); - - void Menu_Debug_Open_Click(wxCommandEvent& event); - void Menu_Debug_MemoryDump_Click(wxCommandEvent& event); - void Menu_Debug_CreateBlockdump_Click(wxCommandEvent& event); - void Menu_Ask_On_Boot_Click(wxCommandEvent& event); - - void Menu_ShowConsole(wxCommandEvent& event); - void Menu_ChangeLang(wxCommandEvent& event); - void Menu_ShowConsole_Stdio(wxCommandEvent& event); - - void Menu_GetStarted(wxCommandEvent& event); - void Menu_Compatibility(wxCommandEvent& event); - void Menu_Forums(wxCommandEvent& event); - void Menu_Website(wxCommandEvent& event); - void Menu_Github(wxCommandEvent& event); - void Menu_Wiki(wxCommandEvent& event); - void Menu_ShowAboutBox(wxCommandEvent& event); - void Menu_ShowGSDump(wxCommandEvent& event); - - void Menu_Capture_Video_ToggleCapture_Click(wxCommandEvent& event); - void Menu_Capture_Video_IncludeAudio_Click(wxCommandEvent& event); - void Menu_Capture_Screenshot_Screenshot_Click(wxCommandEvent& event); - void Menu_Capture_Screenshot_Screenshot_As_Click(wxCommandEvent& event); - - void _DoBootCdvd(); - bool _DoSelectIsoBrowser(wxString& dest); - bool _DoSelectELFBrowser(); - - // ------------------------------------------------------------------------ - // MainEmuFram Internal API for Populating Main Menu Contents - // ------------------------------------------------------------------------ - - wxMenu* MakeStatesSubMenu(int baseid, int loadBackupId = -1) const; - - void ConnectMenus(); - - friend class Pcsx2App; -}; diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp deleted file mode 100644 index 528645e812..0000000000 --- a/pcsx2/gui/MainMenuClicks.cpp +++ /dev/null @@ -1,890 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "App.h" -#include "CDVD/CDVD.h" -#include "GS.h" -#include "GSFrame.h" -#include "IniInterface.h" -#include "SPU2/spu2.h" -#include "SysThreads.h" -#include "DEV9/DEV9.h" -#include "USB/USBNull.h" -#include "PAD/Gamepad.h" - -#include "ConsoleLogger.h" -#include "MainFrame.h" -#include "IsoDropTarget.h" - -#include "Dialogs/ModalPopups.h" -#include "Dialogs/ConfigurationDialog.h" -#include "Debugger/DisassemblyDialog.h" - - -#include "fmt/core.h" -#include "wx/numdlg.h" - - -using namespace Dialogs; - -void MainEmuFrame::Menu_SysSettings_Click(wxCommandEvent& event) -{ - AppOpenModalDialog(wxEmptyString, this); -} - -void MainEmuFrame::Menu_PINE_Settings_Click(wxCommandEvent& event) -{ - AppOpenDialog(this); -} - -void MainEmuFrame::Menu_AudioSettings_Click(wxCommandEvent& event) -{ - SPU2configure(); -} - -void MainEmuFrame::Menu_McdSettings_Click(wxCommandEvent& event) -{ - ScopedCoreThreadClose closed_core; - closed_core.AllowResume(); - AppOpenModalDialog(wxEmptyString, this); -} - -void MainEmuFrame::Menu_NetworkSettings_Click(wxCommandEvent& event) -{ - DEV9configure(); -} - -void MainEmuFrame::Menu_USBSettings_Click(wxCommandEvent& event) -{ - USBconfigure(); -} - -void MainEmuFrame::Menu_PADSettings_Click(wxCommandEvent& event) -{ - PADconfigure(); -} - -void MainEmuFrame::Menu_GSSettings_Click(wxCommandEvent& event) -{ - GSconfigure(); - - // this is a bit of an ugly hack, but so is the whole of the threading nonsense. - // we need to tear down USB/PAD before we apply settings, because the window handle - // will change on renderer change. but we can't do that in ApplySettings() because - // that happens on the UI thread instead of the core thread.... - GSFrame* gs_frame = wxGetApp().GetGsFramePtr(); - const bool gs_frame_open = gs_frame && gs_frame->IsShown(); - const Pcsx2Config::GSOptions old_options(g_Conf->EmuOptions.GS); - g_Conf->EmuOptions.GS.ReloadIniSettings(); - if (!g_Conf->EmuOptions.GS.RestartOptionsAreEqual(old_options)) - { - ScopedCoreThreadPause pauser(static_cast(System_USB | System_PAD)); - wxGetApp().SysApplySettings(); - } - else - { - wxGetApp().SysApplySettings(); - } - - // re-hide the GS window after changing renderers if we were paused - gs_frame = wxGetApp().GetGsFramePtr(); - if (!gs_frame_open && gs_frame && gs_frame->IsShown()) - gs_frame->Hide(); -} - -void MainEmuFrame::Menu_WindowSettings_Click(wxCommandEvent& event) -{ - wxCommandEvent evt(pxEvt_SetSettingsPage); - evt.SetString(L"GS Window"); - AppOpenDialog(this)->GetEventHandler()->ProcessEvent(evt); -} - -void MainEmuFrame::Menu_SelectBios_Click(wxCommandEvent& event) -{ - AppOpenDialog(this); -} - -void MainEmuFrame::Menu_ChangeLang(wxCommandEvent& event) // Always in English -{ - AppOpenDialog(this); -} - -static void WipeSettings() -{ - wxGetApp().CleanupRestartable(); - wxGetApp().CleanupResources(); - - wxRemoveFile(GetUiSettingsFilename()); - wxRemoveFile(GetVmSettingsFilename()); - - // FIXME: wxRmdir doesn't seem to work here for some reason but deleting the inis folder - // manually from explorer does work. Can't think of a good work-around at the moment. --air - - //wxRmdir( GetSettingsFolder().ToString() ); - - wxGetApp().GetRecentIsoManager().Clear(); - g_Conf = std::unique_ptr(new AppConfig()); - sMainFrame.RemoveCdvdMenu(); - - sApp.WipeUserModeSettings(); -} - -void MainEmuFrame::RemoveCdvdMenu() -{ - // Delete() keeps the sub menu and delete the menu item. - // Remove() does not delete the menu item. - if (m_menuItem_RecentIsoMenu) - m_menuCDVD.Delete(m_menuItem_RecentIsoMenu); - m_menuItem_RecentIsoMenu = nullptr; -} - -void MainEmuFrame::Menu_ResetAllSettings_Click(wxCommandEvent& event) -{ - if (IsBeingDeleted() || m_RestartEmuOnDelete) - return; - - { - ScopedCoreThreadPopup suspender; - if (!Msgbox::OkCancel(pxsFmt( - pxE(L"This command clears %s settings and allows you to re-run the First-Time Wizard. You will need to manually restart %s after this operation.\n\nWARNING!! Click OK to delete *ALL* settings for %s and force-close the app, losing any current emulation progress. Are you absolutely sure?"), WX_STR(pxGetAppName()), WX_STR(pxGetAppName()), WX_STR(pxGetAppName())), - _("Reset all settings?"))) - { - suspender.AllowResume(); - return; - } - } - - WipeSettings(); - wxGetApp().PostMenuAction(MenuId_Exit); -} - -// Return values: -// wxID_CANCEL - User canceled the action outright. -// wxID_RESET - User wants to reset the emu in addition to swap discs -// (anything else) - Standard swap, no reset. (hotswap!) -wxWindowID SwapOrReset_Iso(wxWindow* owner, IScopedCoreThread& core_control, const wxString& isoFilename, const wxString& descpart1) -{ - if (GSDump::isRunning) - { - wxMessageBox("Please close the GS debugger first before playing a game", _("GS Debugger"), wxICON_ERROR); - return wxID_CANCEL; - } - wxWindowID result = wxID_CANCEL; - - if ((g_Conf->CdvdSource == CDVD_SourceType::Iso) && (isoFilename == g_Conf->CurrentIso)) - { - core_control.AllowResume(); - return result; - } - - if (SysHasValidState()) - { - core_control.DisallowResume(); - wxDialogWithHelpers dialog(owner, _("Confirm ISO image change")); - - dialog += dialog.Heading(descpart1); // New lines already applied - dialog += dialog.Text(isoFilename); - dialog += dialog.GetCharHeight(); - dialog += dialog.Heading(_("Do you want to swap discs or boot the new image (via system reset)?")); - - result = pxIssueConfirmation(dialog, MsgButtons().Reset().Cancel().Custom(_("Swap Disc"), "swap")); - if (result == wxID_CANCEL) - { - core_control.AllowResume(); - return result; - } - } - - g_CDVDReset = true; - g_Conf->CdvdSource = CDVD_SourceType::Iso; - SysUpdateIsoSrcFile(isoFilename); - - if (result == wxID_RESET) - { - core_control.DisallowResume(); - sApp.SysExecute(CDVD_SourceType::Iso); - } - else - { - Console.Indent().WriteLn("HotSwapping to new ISO src image!"); - //g_Conf->CdvdSource = CDVDsrc_Iso; - //CoreThread.ChangeCdvdSource(); - core_control.AllowResume(); - } - - return result; -} - -// Return values: -// wxID_CANCEL - User canceled the action outright. -// wxID_RESET - User wants to reset the emu in addition to swap discs -// (anything else) - Standard swap, no reset. (hotswap!) -wxWindowID SwapOrReset_Disc(wxWindow* owner, IScopedCoreThread& core, const wxString driveLetter) -{ - if (GSDump::isRunning) - { - wxMessageBox("Please close the GS debugger first before playing a game", _("GS Debugger"), wxICON_ERROR); - return wxID_CANCEL; - } - wxWindowID result = wxID_CANCEL; - - if ((g_Conf->CdvdSource == CDVD_SourceType::Disc) && (driveLetter == g_Conf->Folders.RunDisc)) - { - core.AllowResume(); - return result; - } - - if (SysHasValidState()) - { - core.DisallowResume(); - wxDialogWithHelpers dialog(owner, _("Confirm disc change")); - - dialog += dialog.Heading("New drive selected: " + driveLetter); - dialog += dialog.GetCharHeight(); - dialog += dialog.Heading(_("Do you want to swap discs or boot the new disc (via system reset)?")); - - result = pxIssueConfirmation(dialog, MsgButtons().Reset().Cancel().Custom(_("Swap Disc"), "swap")); - if (result == wxID_CANCEL) - { - core.AllowResume(); - return result; - } - } - - g_Conf->CdvdSource = CDVD_SourceType::Disc; - SysUpdateDiscSrcDrive(driveLetter); - if (result == wxID_RESET) - { - core.DisallowResume(); - sApp.SysExecute(CDVD_SourceType::Disc); - } - else - { - Console.Indent().WriteLn("Hot swapping to new disc!"); - core.AllowResume(); - } - - return result; -} - -wxWindowID SwapOrReset_CdvdSrc(wxWindow* owner, CDVD_SourceType newsrc) -{ - if (GSDump::isRunning) - { - wxMessageBox("Please close the GS debugger first before playing a game", _("GS Debugger"), wxICON_ERROR); - return wxID_CANCEL; - } - if (newsrc == g_Conf->CdvdSource) - return wxID_CANCEL; - wxWindowID result = wxID_CANCEL; - ScopedCoreThreadPopup core; - - if (SysHasValidState()) - { - wxDialogWithHelpers dialog(owner, _("Confirm CDVD source change")); - - wxString changeMsg; - changeMsg.Printf(_("You've selected to switch the CDVD source from %s to %s."), - CDVD_SourceLabels[enum_cast(g_Conf->CdvdSource)], CDVD_SourceLabels[enum_cast(newsrc)]); - - dialog += dialog.Heading(changeMsg + L"\n\n" + - _("Do you want to swap discs or boot the new image (system reset)?")); - - result = pxIssueConfirmation(dialog, MsgButtons().Reset().Cancel().Custom(_("Swap Disc"), "swap")); - - if (result == wxID_CANCEL) - { - core.AllowResume(); - sMainFrame.UpdateCdvdSrcSelection(); - return result; - } - } - - g_CDVDReset = true; - CDVD_SourceType oldsrc = g_Conf->CdvdSource; - g_Conf->CdvdSource = newsrc; - - if (result != wxID_RESET) - { - Console.Indent().WriteLn("(CdvdSource) HotSwapping CDVD source types from %ls to %ls.", - WX_STR(wxString(CDVD_SourceLabels[enum_cast(oldsrc)])), - WX_STR(wxString(CDVD_SourceLabels[enum_cast(newsrc)]))); - //CoreThread.ChangeCdvdSource(); - sMainFrame.UpdateCdvdSrcSelection(); - core.AllowResume(); - } - else - { - core.DisallowResume(); - sApp.SysExecute(g_Conf->CdvdSource); - } - - return result; -} - -static wxString JoinFiletypes(const wxChar** src) -{ - wxString dest; - while (*src != NULL) - { - if (*src[0] == 0) - continue; - if (!dest.IsEmpty()) - dest += L";"; - - dest += pxsFmt(L"*.%ls", *src); - - if (wxFileName::IsCaseSensitive()) - { - // omgosh! the filesystem is CaSE SeNSiTiVE!! - dest += pxsFmt(L";*.%ls", *src).ToUpper(); - } - - ++src; - } - - return dest; -} - -// Returns FALSE if the user canceled the action. -bool MainEmuFrame::_DoSelectIsoBrowser(wxString& result) -{ - static const wxChar* isoSupportedTypes[] = - { - L"iso", L"mdf", L"nrg", L"bin", L"img", NULL}; - - const wxString isoSupportedLabel(JoinString(isoSupportedTypes, L" ")); - const wxString isoSupportedList(JoinFiletypes(isoSupportedTypes)); - - wxArrayString isoFilterTypes; - - isoFilterTypes.Add(pxsFmt(_("All Supported (%s)"), WX_STR((isoSupportedLabel + L" .dump" + L" .gz" + L" .cso" + L" .chd")))); - isoFilterTypes.Add(isoSupportedList + L";*.dump" + L";*.gz" + L";*.cso" + L";*.chd"); - - isoFilterTypes.Add(pxsFmt(_("Disc Images (%s)"), WX_STR(isoSupportedLabel))); - isoFilterTypes.Add(isoSupportedList); - - isoFilterTypes.Add(pxsFmt(_("Blockdumps (%s)"), L".dump")); - isoFilterTypes.Add(L"*.dump"); - - isoFilterTypes.Add(pxsFmt(_("Compressed (%s)"), L".gz .cso .chd")); - isoFilterTypes.Add(L"*.gz;*.cso;*.chd"); - - isoFilterTypes.Add(_("All Files (*.*)")); - isoFilterTypes.Add(L"*.*"); - - wxFileDialog ctrl(this, _("Select disc image, compressed disc image, or block-dump..."), g_Conf->Folders.RunIso.ToString(), wxEmptyString, - JoinString(isoFilterTypes, L"|"), wxFD_OPEN | wxFD_FILE_MUST_EXIST); - - if (ctrl.ShowModal() != wxID_CANCEL) - { - result = ctrl.GetPath(); - g_Conf->Folders.RunIso = wxFileName(result).GetPath(); - return true; - } - - return false; -} - -bool MainEmuFrame::_DoSelectELFBrowser() -{ - static const wxChar* elfFilterType = L"ELF Files (.elf)|*.elf;*.ELF"; - - wxFileDialog ctrl(this, _("Select ELF file..."), g_Conf->Folders.RunELF.ToString(), wxEmptyString, - (wxString)elfFilterType + L"|" + _("All Files (*.*)") + L"|*.*", wxFD_OPEN | wxFD_FILE_MUST_EXIST); - - if (ctrl.ShowModal() != wxID_CANCEL) - { - g_Conf->Folders.RunELF = wxFileName(ctrl.GetPath()).GetPath(); - g_Conf->CurrentELF = ctrl.GetPath(); - return true; - } - - return false; -} - -void MainEmuFrame::_DoBootCdvd() -{ - if (GSDump::isRunning) - { - wxMessageBox("Please close the GS debugger first before playing a game", _("GS Debugger"), wxICON_ERROR); - return; - } - ScopedCoreThreadPause paused_core; - - if (g_Conf->CdvdSource == CDVD_SourceType::Iso) - { - bool selector = g_Conf->CurrentIso.IsEmpty(); - - if (!selector && !wxFileExists(g_Conf->CurrentIso)) - { - // User has an iso selected from a previous run, but it doesn't exist anymore. - // Issue a courtesy popup and then an Iso Selector to choose a new one. - - wxDialogWithHelpers dialog(this, _("ISO file not found!")); - dialog += dialog.Heading( - _("An error occurred while trying to open the file:") + wxString(L"\n\n") + g_Conf->CurrentIso + L"\n\n" + - _("Error: The configured ISO file does not exist. Click OK to select a new ISO source for CDVD.")); - - pxIssueConfirmation(dialog, MsgButtons().OK()); - - selector = true; - } - - if (selector || g_Conf->AskOnBoot) - { - wxString result; - if (!_DoSelectIsoBrowser(result)) - { - paused_core.AllowResume(); - return; - } - - SysUpdateIsoSrcFile(result); - } - } - - if (SysHasValidState()) - { - wxDialogWithHelpers dialog(this, _("Confirm PS2 Reset")); - dialog += dialog.Heading(GetMsg_ConfirmSysReset()); - bool confirmed = (pxIssueConfirmation(dialog, MsgButtons().Yes().Cancel(), L"BootCdvd.ConfirmReset") != wxID_CANCEL); - - if (!confirmed) - { - paused_core.AllowResume(); - return; - } - } - - sApp.SysExecute(g_Conf->CdvdSource); -} - -void MainEmuFrame::Menu_CdvdSource_Click(wxCommandEvent& event) -{ - CDVD_SourceType newsrc = CDVD_SourceType::NoDisc; - - switch (event.GetId()) - { - case MenuId_Src_Iso: - newsrc = CDVD_SourceType::Iso; - break; - case MenuId_Src_Disc: - newsrc = CDVD_SourceType::Disc; - break; - case MenuId_Src_NoDisc: - newsrc = CDVD_SourceType::NoDisc; - break; - jNO_DEFAULT - } - - SwapOrReset_CdvdSrc(this, newsrc); - ApplyCDVDStatus(); -} - -void MainEmuFrame::Menu_BootCdvd_Click(wxCommandEvent& event) -{ - g_Conf->EmuOptions.UseBOOT2Injection = g_Conf->EnableFastBoot; - _DoBootCdvd(); -} - -void MainEmuFrame::Menu_FastBoot_Click(wxCommandEvent& event) -{ - g_Conf->EnableFastBoot = GetMenuBar()->IsChecked(MenuId_Config_FastBoot); - AppApplySettings(); - AppSaveSettings(); - UpdateStatusBar(); -} - -wxString GetMsg_IsoImageChanged() -{ - return _("You have selected the following ISO image into PCSX2:\n\n"); -} - -void MainEmuFrame::Menu_IsoBrowse_Click(wxCommandEvent& event) -{ - ScopedCoreThreadPopup core; - wxString isofile; - - if (!_DoSelectIsoBrowser(isofile)) - { - core.AllowResume(); - return; - } - - SwapOrReset_Iso(this, core, isofile, GetMsg_IsoImageChanged()); - AppSaveSettings(); // save the new iso selection; update menus! -} - -void MainEmuFrame::Menu_IsoClear_Click(wxCommandEvent& event) -{ - wxDialogWithHelpers dialog(this, _("Confirm clearing ISO list")); - dialog += dialog.Heading(_("This will clear the ISO list. If an ISO is running it will remain in the list. Continue?")); - - bool confirmed = pxIssueConfirmation(dialog, MsgButtons().YesNo()) == wxID_YES; - - if (confirmed) - { - // If the CDVD mode is not ISO, or the system isn't running, wipe the CurrentIso field in INI file - if (g_Conf->CdvdSource != CDVD_SourceType::Iso || !SysHasValidState()) - SysUpdateIsoSrcFile(""); - wxGetApp().GetRecentIsoManager().Clear(); - AppSaveSettings(); - } -} - -void MainEmuFrame::Menu_IsoClearMissing_Click(wxCommandEvent& event) -{ - auto& iso_manager = wxGetApp().GetRecentIsoManager(); - const auto& missing_files = iso_manager.GetMissingFiles(); - - if (missing_files.empty()) - { - wxDialogWithHelpers dialog(this, _("Information")); - dialog += dialog.Heading(_("No files to remove.")); - pxIssueConfirmation(dialog, MsgButtons().OK()); - } - else - { - wxDialogWithHelpers dialog(this, _("Confirm clearing ISO list")); - dialog += dialog.Heading(_("The following entries will be removed from the ISO list. Continue?")); - - wxString missing_files_list; - - for (const auto& file : missing_files) - { - missing_files_list += "* "; - missing_files_list += file.Filename; - missing_files_list += "\n"; - } - - dialog += dialog.Text(missing_files_list); - - const bool confirmed = pxIssueConfirmation(dialog, MsgButtons().YesNo()) == wxID_YES; - - if (confirmed) - { - // If the CDVD mode is not ISO, or the system isn't running, wipe the CurrentIso field in INI file - if (g_Conf->CdvdSource != CDVD_SourceType::Iso || !SysHasValidState()) - SysUpdateIsoSrcFile(""); - iso_manager.ClearMissing(); - AppSaveSettings(); - } - } -} - -void MainEmuFrame::Menu_Ask_On_Boot_Click(wxCommandEvent& event) -{ - g_Conf->AskOnBoot = event.IsChecked(); - - if (SysHasValidState()) - return; - - wxGetApp().GetRecentIsoManager().EnableItems(!event.IsChecked()); - FindItemInMenuBar(MenuId_IsoBrowse)->Enable(!event.IsChecked()); -} - -void MainEmuFrame::Menu_Debug_CreateBlockdump_Click(wxCommandEvent& event) -{ - g_Conf->EmuOptions.CdvdDumpBlocks = event.IsChecked(); - if (g_Conf->EmuOptions.CdvdDumpBlocks && SysHasValidState()) - Console.Warning("VM must be rebooted to create a useful block dump."); - - AppSaveSettings(); -} - -void MainEmuFrame::Menu_MultitapToggle_Click(wxCommandEvent&) -{ - g_Conf->EmuOptions.MultitapPort0_Enabled = GetMenuBar()->IsChecked(MenuId_Config_Multitap0Toggle); - g_Conf->EmuOptions.MultitapPort1_Enabled = GetMenuBar()->IsChecked(MenuId_Config_Multitap1Toggle); - AppApplySettings(); - AppSaveSettings(); - - //evt.Skip(); -} - -void MainEmuFrame::Menu_EnableBackupStates_Click(wxCommandEvent&) -{ - g_Conf->EmuOptions.BackupSavestate = GetMenuBar()->IsChecked(MenuId_EnableBackupStates); - - //without the next line, after toggling this menu-checkbox, the change only applies from the 2nd save and onwards - // (1st save after the toggle keeps the old pre-toggle value).. - // wonder what that means for all the other menu checkboxes which only use AppSaveSettings... (avih) - AppApplySettings(); - AppSaveSettings(); -} - -void MainEmuFrame::Menu_EnablePatches_Click(wxCommandEvent&) -{ - g_Conf->EmuOptions.EnablePatches = GetMenuBar()->IsChecked(MenuId_EnablePatches); - AppApplySettings(); - AppSaveSettings(); -} - -void MainEmuFrame::Menu_EnableCheats_Click(wxCommandEvent&) -{ - g_Conf->EmuOptions.EnableCheats = GetMenuBar()->IsChecked(MenuId_EnableCheats); - AppApplySettings(); - AppSaveSettings(); -} - -void MainEmuFrame::Menu_PINE_Enable_Click(wxCommandEvent&) -{ - g_Conf->EmuOptions.EnablePINE = GetMenuBar()->IsChecked(MenuId_PINE_Enable); - AppApplySettings(); - AppSaveSettings(); -} - -void MainEmuFrame::Menu_EnableWideScreenPatches_Click(wxCommandEvent&) -{ - g_Conf->EmuOptions.EnableWideScreenPatches = GetMenuBar()->IsChecked(MenuId_EnableWideScreenPatches); - AppApplySettings(); - AppSaveSettings(); -} - -void MainEmuFrame::Menu_EnableRecordingTools_Click(wxCommandEvent& event) -{ - Msgbox::Alert("Input Recording has been deprecated from the wxWidgets version.\nUse an older dev build (before v1.7.3650) or switch to the Qt version!\nOld recordings should still play correctly!"); - return; -} - -void MainEmuFrame::Menu_EnableHostFs_Click(wxCommandEvent&) -{ - g_Conf->EmuOptions.HostFs = GetMenuBar()->IsChecked(MenuId_EnableHostFs); - AppSaveSettings(); -} - -void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent&) -{ - ScopedCoreThreadClose stopped_core; - if (_DoSelectELFBrowser()) - { - g_Conf->EmuOptions.UseBOOT2Injection = true; - sApp.SysExecute(g_Conf->CdvdSource, g_Conf->CurrentELF); - } - - stopped_core.AllowResume(); -} - -void MainEmuFrame::Menu_LoadStates_Click(wxCommandEvent& event) -{ - if (event.GetId() == MenuId_State_LoadBackup) - { - States_DefrostCurrentSlotBackup(); - return; - } - - States_SetCurrentSlot(event.GetId() - MenuId_State_Load01 - 1); - States_DefrostCurrentSlot(); -} - -void MainEmuFrame::Menu_SaveStates_Click(wxCommandEvent& event) -{ - States_SetCurrentSlot(event.GetId() - MenuId_State_Save01 - 1); - States_FreezeCurrentSlot(); -} - -void MainEmuFrame::Menu_LoadStateFromFile_Click(wxCommandEvent& event) -{ - wxFileDialog loadStateDialog(this, _("Load State"), L"", L"", - L"Savestate files (*.p2s)|*.p2s", wxFD_OPEN); - - if (loadStateDialog.ShowModal() == wxID_CANCEL) - { - return; - } - - wxString path = loadStateDialog.GetPath(); - StateCopy_LoadFromFile(path); -} - -void MainEmuFrame::Menu_SaveStateToFile_Click(wxCommandEvent& event) -{ - wxFileDialog saveStateDialog(this, _("Save State"), L"", L"", - L"Savestate files (*.p2s)|*.p2s", wxFD_OPEN); - - if (saveStateDialog.ShowModal() == wxID_CANCEL) - { - return; - } - - wxString path = saveStateDialog.GetPath(); - StateCopy_SaveToFile(path); -} - -void MainEmuFrame::Menu_Exit_Click(wxCommandEvent& event) -{ - Close(); -} - -class SysExecEvent_ToggleSuspend : public SysExecEvent -{ -public: - virtual ~SysExecEvent_ToggleSuspend() = default; - - wxString GetEventName() const { return L"ToggleSuspendResume"; } - -protected: - void InvokeEvent() - { - if (CoreThread.IsOpen()) - { - CoreThread.Suspend(); - } - else - CoreThread.Resume(); - } -}; - -void MainEmuFrame::Menu_SuspendResume_Click(wxCommandEvent& event) -{ - if (!SysHasValidState()) - return; - - // Disable the menu item. The state of the menu is indeterminate until the core thread - // has responded (it updates status after emulation has engaged successfully). - - EnableMenuItem(MenuId_Sys_SuspendResume, false); - GetSysExecutorThread().PostEvent(new SysExecEvent_ToggleSuspend()); -} - -void MainEmuFrame::Menu_SysShutdown_Click(wxCommandEvent& event) -{ - if (m_capturingVideo) - VideoCaptureToggle(); - UI_DisableSysShutdown(); - Console.SetTitle("PCSX2 Program Log"); - CoreThread.Reset(); -} - -void MainEmuFrame::Menu_Debug_Open_Click(wxCommandEvent& event) -{ - DisassemblyDialog* dlg = wxGetApp().GetDisassemblyPtr(); - if (dlg) - { - if (event.IsChecked()) - dlg->Show(); - else - dlg->Hide(); - } -} - -void MainEmuFrame::Menu_Debug_MemoryDump_Click(wxCommandEvent& event) -{ -} - -void MainEmuFrame::Menu_ShowConsole(wxCommandEvent& event) -{ - // Use messages to relay open/close commands (thread-safe) - - g_Conf->ProgLogBox.Visible = event.IsChecked(); - wxCommandEvent evt(wxEVT_MENU, g_Conf->ProgLogBox.Visible ? wxID_OPEN : wxID_CLOSE); - wxGetApp().ProgramLog_PostEvent(evt); -} - -void MainEmuFrame::Menu_ShowConsole_Stdio(wxCommandEvent& event) -{ - g_Conf->EmuOptions.ConsoleToStdio = GetMenuBar()->IsChecked(MenuId_Console_Stdio); - AppSaveSettings(); -} - -void MainEmuFrame::Menu_GetStarted(wxCommandEvent& event) -{ - wxLaunchDefaultBrowser("https://pcsx2.net/guides/basic-setup/"); -} - -void MainEmuFrame::Menu_Compatibility(wxCommandEvent& event) -{ - wxLaunchDefaultBrowser("https://pcsx2.net/compat/"); -} - -void MainEmuFrame::Menu_Forums(wxCommandEvent& event) -{ - wxLaunchDefaultBrowser("https://forums.pcsx2.net/"); -} - -void MainEmuFrame::Menu_Website(wxCommandEvent& event) -{ - wxLaunchDefaultBrowser("https://pcsx2.net/"); -} - -void MainEmuFrame::Menu_Github(wxCommandEvent& event) -{ - wxLaunchDefaultBrowser("https://github.com/PCSX2/pcsx2"); -} - -void MainEmuFrame::Menu_Wiki(wxCommandEvent& event) -{ - wxLaunchDefaultBrowser("https://wiki.pcsx2.net/Main_Page"); -} - -void MainEmuFrame::Menu_ShowAboutBox(wxCommandEvent& event) -{ - AppOpenDialog(this); -} - -void MainEmuFrame::Menu_ShowGSDump(wxCommandEvent& event) -{ - AppOpenDialog(this); -} - -void MainEmuFrame::Menu_Capture_Video_ToggleCapture_Click(wxCommandEvent& event) -{ - ScopedCoreThreadPause paused_core; - paused_core.AllowResume(); - VideoCaptureToggle(); -} - -void MainEmuFrame::Menu_Capture_Video_IncludeAudio_Click(wxCommandEvent& event) -{ - g_Conf->AudioCapture.EnableAudio = GetMenuBar()->IsChecked(MenuId_Capture_Video_IncludeAudio); - ApplySettings(); -} - -void MainEmuFrame::VideoCaptureToggle() -{ -} - -void MainEmuFrame::Menu_Capture_Screenshot_Screenshot_Click(wxCommandEvent& event) -{ - if (!CoreThread.IsOpen()) - { - return; - } - GSQueueSnapshot(std::string(), 0); -} - -void MainEmuFrame::Menu_Capture_Screenshot_Screenshot_As_Click(wxCommandEvent& event) -{ - if (!CoreThread.IsOpen()) - return; - - // Ensure emulation is paused so that the correct image is captured - bool wasPaused = CoreThread.IsPaused(); - if (!wasPaused) - CoreThread.Pause({}); - - wxFileDialog fileDialog(this, _("Select a file"), g_Conf->Folders.Snapshots.ToAscii(), wxEmptyString, "PNG files (*.png)|*.png", wxFD_SAVE | wxFD_OVERWRITE_PROMPT); - - if (fileDialog.ShowModal() == wxID_OK) - GSQueueSnapshot(StringUtil::wxStringToUTF8String(fileDialog.GetPath()), 0); - - // Resume emulation - if (!wasPaused) - CoreThread.Resume(); -} - diff --git a/pcsx2/gui/MessageBoxes.cpp b/pcsx2/gui/MessageBoxes.cpp deleted file mode 100644 index d2b0bff6a7..0000000000 --- a/pcsx2/gui/MessageBoxes.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "MSWstuff.h" -#include "Dialogs/ModalPopups.h" - -using namespace Threading; -using namespace pxSizerFlags; - -// Thread Safety: Must be called from the GUI thread ONLY. Will assert otherwise. -// -// [TODO] Add support for icons? -// -static int pxMessageDialog( const wxString& caption, const wxString& content, const MsgButtons& buttons ) -{ - if( !AffinityAssert_AllowFrom_MainUI() ) return wxID_CANCEL; - - // fixme: If the emulator is currently active and is running in exclusive mode (forced - // fullscreen), then we need to either: - // 1) Exit fullscreen mode before issuing the popup. - // 2) Issue the popup with wxSTAY_ON_TOP specified so that the user will see it. - // - // And in either case the emulation should be paused/suspended for the user. - - wxDialogWithHelpers dialog( NULL, caption ); - dialog.SetMinWidth( ((content.Length() > 256) ? 525 : 460) * MSW_GetDPIScale() ); - dialog += dialog.Heading( content ) | StdExpand(); - return pxIssueConfirmation( dialog, buttons ); -} - -// -------------------------------------------------------------------------------------- -// BaseMessageBoxEvent Implementation -// -------------------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS( BaseMessageBoxEvent, pxActionEvent ); - -BaseMessageBoxEvent::BaseMessageBoxEvent( const wxString& content, SynchronousActionState& instdata ) - : m_Content( content ) -{ - m_state = &instdata; -} - -BaseMessageBoxEvent::BaseMessageBoxEvent( const wxString& content, SynchronousActionState* instdata ) - : m_Content( content ) -{ - m_state = instdata; -} - -BaseMessageBoxEvent::BaseMessageBoxEvent( const BaseMessageBoxEvent& event ) - : pxActionEvent(), m_Content( event.m_Content ) -{ - m_state = event.m_state; -} - -// Thread Safety: Must be called from the GUI thread ONLY. -void BaseMessageBoxEvent::InvokeEvent() -{ - int result = _DoDialog(); - if( m_state ) m_state->PostResult( result ); -} - -int BaseMessageBoxEvent::_DoDialog() const -{ - pxFailDev( "Abstract Base MessageBox Event." ); - return wxID_CANCEL; -} - -// -------------------------------------------------------------------------------------- -// pxMessageBoxEvent Implementation -// -------------------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS( pxMessageBoxEvent, BaseMessageBoxEvent ); - -pxMessageBoxEvent::pxMessageBoxEvent( const wxString& title, const wxString& content, const MsgButtons& buttons, SynchronousActionState& instdata ) - : BaseMessageBoxEvent( content, instdata ) - , m_Title( title ) - , m_Buttons( buttons ) -{ -} - -pxMessageBoxEvent::pxMessageBoxEvent( const wxString& title, const wxString& content, const MsgButtons& buttons, SynchronousActionState* instdata ) - : BaseMessageBoxEvent( content, instdata ) - , m_Title( title ) - , m_Buttons( buttons ) -{ -} - -int pxMessageBoxEvent::_DoDialog() const -{ - return pxMessageDialog( m_Title, m_Content, m_Buttons ); -} - -// -------------------------------------------------------------------------------------- -// pxAssertionEvent Implementation -// -------------------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS( pxAssertionEvent, BaseMessageBoxEvent ); - -pxAssertionEvent::pxAssertionEvent( const wxString& content, const wxString& trace, SynchronousActionState& instdata ) - : BaseMessageBoxEvent( content, instdata ) - , m_Stacktrace( trace ) -{ -} - -pxAssertionEvent::pxAssertionEvent( const wxString& content, const wxString& trace, SynchronousActionState* instdata ) - : BaseMessageBoxEvent( content, instdata ) - , m_Stacktrace( trace ) -{ -} - -pxAssertionEvent& pxAssertionEvent::SetStacktrace( const wxString& trace ) -{ - m_Stacktrace = trace; - return *this; -} - -int pxAssertionEvent::_DoDialog() const -{ - return Dialogs::AssertionDialog( m_Content, m_Stacktrace ).ShowModal(); -} - -namespace Msgbox -{ - int ShowModal( BaseMessageBoxEvent& evt ) - { - SynchronousActionState instdat; - evt.SetSyncState( instdat ); - - if( wxThread::IsMain() ) - { - // main thread can handle the message immediately. - wxGetApp().ProcessEvent( evt ); - return instdat.return_value; - } - else - { - // Not on main thread, must post the message there for handling instead: - wxGetApp().AddPendingEvent( evt ); - return instdat.WaitForResult(); // Important! disable cancellation since we're using local stack vars. - } - } - - int ShowModal( const wxString& title, const wxString& content, const MsgButtons& buttons ) - { - pxMessageBoxEvent tevt( title, content, buttons ); - return ShowModal( tevt ); - } - - // Pops up an alert Dialog Box with a singular "OK" button. - // Always returns false. - bool Alert( const wxString& text, const wxString& caption, int icon ) - { - ShowModal( caption, text, MsgButtons().OK() ); - return false; - } - - // Pops up a dialog box with Ok/Cancel buttons. Returns the result of the inquiry, - // true if OK, false if cancel. - bool OkCancel( const wxString& text, const wxString& caption, int icon ) - { - return ShowModal(caption, text, MsgButtons().OKCancel()) == wxID_OK; - } - - bool YesNo( const wxString& text, const wxString& caption, int icon ) - { - return ShowModal(caption, text, MsgButtons().YesNo()) == wxID_YES; - } - - int Assertion( const wxString& text, const wxString& stacktrace ) - { - pxAssertionEvent tevt( text, stacktrace ); - return ShowModal( tevt ); - } -} diff --git a/pcsx2/gui/Mutex.cpp b/pcsx2/gui/Mutex.cpp deleted file mode 100644 index b6e8882eb2..0000000000 --- a/pcsx2/gui/Mutex.cpp +++ /dev/null @@ -1,346 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "PersistentThread.h" -#include - -namespace Threading -{ - static std::atomic _attr_refcount(0); - static pthread_mutexattr_t _attr_recursive; -} // namespace Threading - -// -------------------------------------------------------------------------------------- -// Mutex Implementations -// -------------------------------------------------------------------------------------- - -#if defined(_WIN32) || (defined(_POSIX_TIMEOUTS) && _POSIX_TIMEOUTS >= 200112L) -// good, we have pthread_mutex_timedlock -#define xpthread_mutex_timedlock pthread_mutex_timedlock -#else -// We have to emulate pthread_mutex_timedlock(). This could be a serious -// performance drain if its used a lot. - -#include // gettimeofday() - -// sleep for 10ms at a time -#define TIMEDLOCK_EMU_SLEEP_NS 10000000ULL - -// Original POSIX docs: -// -// The pthread_mutex_timedlock() function shall lock the mutex object -// referenced by mutex. If the mutex is already locked, the calling thread -// shall block until the mutex becomes available as in the -// pthread_mutex_lock() function. If the mutex cannot be locked without -// waiting for another thread to unlock the mutex, this wait shall be -// terminated when the specified timeout expires. -// -// This is an implementation that emulates pthread_mutex_timedlock() via -// pthread_mutex_trylock(). -static int xpthread_mutex_timedlock( - pthread_mutex_t* mutex, - const struct timespec* abs_timeout) -{ - int err = 0; - - while ((err = pthread_mutex_trylock(mutex)) == EBUSY) - { - // check if the timeout has expired, gettimeofday() is implemented - // efficiently (in userspace) on OSX - struct timeval now; - gettimeofday(&now, NULL); - if (now.tv_sec > abs_timeout->tv_sec || (now.tv_sec == abs_timeout->tv_sec && (u64)now.tv_usec * 1000ULL > (u64)abs_timeout->tv_nsec)) - { - return ETIMEDOUT; - } - - // acquiring lock failed, sleep some - struct timespec ts; - ts.tv_sec = 0; - ts.tv_nsec = TIMEDLOCK_EMU_SLEEP_NS; - while (nanosleep(&ts, &ts) == -1) - ; - } - - return err; -} -#endif - -Threading::Mutex::Mutex() -{ - pthread_mutex_init(&m_mutex, NULL); -} - -static wxTimeSpan def_detach_timeout(0, 0, 6, 0); - -void Threading::Mutex::Detach() -{ - if (EBUSY != pthread_mutex_destroy(&m_mutex)) - return; - - if (IsRecursive()) - { - // Sanity check: Recursive locks could be held by our own thread, which would - // be considered an assertion failure, but can also be handled gracefully. - // (note: if the mutex is locked recursively more than twice then this assert won't - // detect it) - - Release(); - Release(); // in case of double recursion. - int result = pthread_mutex_destroy(&m_mutex); - if (pxAssertDev(result != EBUSY, "Detachment of a recursively-locked mutex (self-locked!).")) - return; - } - - if (Wait(def_detach_timeout)) - pthread_mutex_destroy(&m_mutex); - else - Console.Error("(Thread Log) Mutex cleanup failed due to possible deadlock."); -} - -Threading::Mutex::~Mutex() -{ - try - { - Mutex::Detach(); - } - DESTRUCTOR_CATCHALL; -} - -Threading::MutexRecursive::MutexRecursive() - : Mutex(false) -{ - if (++_attr_refcount == 1) - { - if (0 != pthread_mutexattr_init(&_attr_recursive)) - pxFailRel("pthread_mutexattr_init() failed"); - - pthread_mutexattr_settype(&_attr_recursive, PTHREAD_MUTEX_RECURSIVE); - } - - if (pthread_mutex_init(&m_mutex, &_attr_recursive)) - Console.Error("(Thread Log) Failed to initialize mutex."); -} - -Threading::MutexRecursive::~MutexRecursive() -{ - if (--_attr_refcount == 0) - pthread_mutexattr_destroy(&_attr_recursive); -} - -// This is a bit of a hackish function, which is technically unsafe, but can be useful for allowing -// the application to survive unexpected or inconvenient failures, where a mutex is deadlocked by -// a rogue thread. This function allows us to Recreate the mutex and let the deadlocked one ponder -// the deeper meanings of the universe for eternity. -void Threading::Mutex::Recreate() -{ - Detach(); - pthread_mutex_init(&m_mutex, NULL); -} - -// Returns: -// true if the mutex had to be recreated due to lock contention, or false if the mutex is safely -// unlocked. -bool Threading::Mutex::RecreateIfLocked() -{ - if (!Wait(def_detach_timeout)) - { - Recreate(); - return true; - } - return false; -} - - -// This is a direct blocking action -- very fast, very efficient, and generally very dangerous -// if used from the main GUI thread, since it typically results in an unresponsive program. -// Call this method directly only if you know the code in question will be run from threads -// other than the main thread. -void Threading::Mutex::AcquireWithoutYield() -{ - pxAssertMsg(!wxThread::IsMain(), "Unyielding mutex acquire issued from the main/gui thread. Please use Acquire() instead."); - pthread_mutex_lock(&m_mutex); -} - -bool Threading::Mutex::AcquireWithoutYield(const wxTimeSpan& timeout) -{ - wxDateTime megafail(wxDateTime::UNow() + timeout); - const timespec fail = {megafail.GetTicks(), megafail.GetMillisecond() * 1000000}; - return xpthread_mutex_timedlock(&m_mutex, &fail) == 0; -} - -void Threading::Mutex::Release() -{ - pthread_mutex_unlock(&m_mutex); -} - -bool Threading::Mutex::TryAcquire() -{ - return EBUSY != pthread_mutex_trylock(&m_mutex); -} - -// This is a wxApp-safe rendition of AcquireWithoutYield, which makes sure to execute pending app events -// and messages *if* the lock is performed from the main GUI thread. -// -void Threading::Mutex::Acquire() -{ - pthread_mutex_lock(&m_mutex); -} - -bool Threading::Mutex::Acquire(const wxTimeSpan& timeout) -{ - return AcquireWithoutYield(timeout); -} - -// Performs a wait on a locked mutex, or returns instantly if the mutex is unlocked. -// Typically this action is used to determine if a thread is currently performing some -// specific task, and to block until the task is finished (PersistentThread uses it to -// determine if the thread is running or completed, for example). -// -// Implemented internally as a simple Acquire/Release pair. -// -void Threading::Mutex::Wait() -{ - Acquire(); - Release(); -} - -// Like wait but spins for a while before sleeping the thread -void Threading::Mutex::WaitWithSpin() -{ - u32 waited = 0; - while (true) - { - if (TryAcquire()) - { - Release(); - return; - } - if (waited >= SPIN_TIME_NS) - break; - waited += ShortSpin(); - } - Wait(); -} - -void Threading::Mutex::WaitWithoutYield() -{ - AcquireWithoutYield(); - Release(); -} - -// Performs a wait on a locked mutex, or returns instantly if the mutex is unlocked. -// (Implemented internally as a simple Acquire/Release pair.) -// -// Returns: -// true if the mutex was freed and is in an unlocked state; or false if the wait timed out -// and the mutex is still locked by another thread. -// -bool Threading::Mutex::Wait(const wxTimeSpan& timeout) -{ - if (Acquire(timeout)) - { - Release(); - return true; - } - return false; -} - -bool Threading::Mutex::WaitWithoutYield(const wxTimeSpan& timeout) -{ - if (AcquireWithoutYield(timeout)) - { - Release(); - return true; - } - return false; -} - -// -------------------------------------------------------------------------------------- -// ScopedLock Implementations -// -------------------------------------------------------------------------------------- - -Threading::ScopedLock::~ScopedLock() -{ - if (m_IsLocked && m_lock) - m_lock->Release(); -} - -Threading::ScopedLock::ScopedLock(const Mutex* locker) -{ - m_IsLocked = false; - AssignAndLock(locker); -} - -Threading::ScopedLock::ScopedLock(const Mutex& locker) -{ - m_IsLocked = false; - AssignAndLock(locker); -} - -void Threading::ScopedLock::AssignAndLock(const Mutex& locker) -{ - AssignAndLock(&locker); -} - -void Threading::ScopedLock::AssignAndLock(const Mutex* locker) -{ - pxAssert(!m_IsLocked); // if we're already locked, changing the lock is bad mojo. - - m_lock = const_cast(locker); - if (!m_lock) - return; - - m_IsLocked = true; - m_lock->Acquire(); -} - -void Threading::ScopedLock::Assign(const Mutex& locker) -{ - m_lock = const_cast(&locker); -} - -void Threading::ScopedLock::Assign(const Mutex* locker) -{ - m_lock = const_cast(locker); -} - -// Provides manual unlocking of a scoped lock prior to object destruction. -void Threading::ScopedLock::Release() -{ - if (!m_IsLocked) - return; - m_IsLocked = false; - if (m_lock) - m_lock->Release(); -} - -// provides manual locking of a scoped lock, to re-lock after a manual unlocking. -void Threading::ScopedLock::Acquire() -{ - if (m_IsLocked || !m_lock) - return; - m_lock->Acquire(); - m_IsLocked = true; -} - -Threading::ScopedLock::ScopedLock(const Mutex& locker, bool isTryLock) -{ - m_lock = const_cast(&locker); - if (!m_lock) - return; - m_IsLocked = isTryLock ? m_lock->TryAcquire() : false; -} diff --git a/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp b/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp deleted file mode 100644 index c625ffa4f2..0000000000 --- a/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp +++ /dev/null @@ -1,224 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" - -#include "ConfigurationPanels.h" -#include "gui/Dialogs/ConfigurationDialog.h" - -#include - -using namespace Dialogs; - -// ----------------------------------------------------------------------- -// This method should be called by the parent dialog box of a configuration -// on dialog destruction. It asserts if the ApplyList hasn't been cleaned up -// and then cleans it up forcefully. -// -void ApplyStateStruct::DoCleanup() noexcept -{ - pxAssertMsg( !PanelList.empty(), "PanelList list hasn't been cleaned up." ); - PanelList.clear(); - ParentBook = NULL; -} - -void ApplyStateStruct::StartBook( wxBookCtrlBase* book ) -{ - pxAssertDev( ParentBook == NULL, "An ApplicableConfig session is already in progress." ); - ParentBook = book; -} - -void ApplyStateStruct::StartWizard() -{ - pxAssertDev( ParentBook == NULL, "An ApplicableConfig session is already in progress." ); -} - -// ----------------------------------------------------------------------- -// -// Parameters: -// pageid - identifier of the page to apply settings for. All other pages will be -// skipped. If pageid is negative (-1) then all pages are applied. -// -// Returns false if one of the panels fails input validation (in which case dialogs -// should not be closed, etc). -// -bool ApplyStateStruct::ApplyPage( int pageid ) -{ - bool retval = true; - - // Save these settings so we can restore them if the Apply fails. - - DocsModeType oldDocsMode = DocsFolderMode; - wxDirName oldSettingsFolder = SettingsFolder; - bool oldUseDefSet = UseDefaultSettingsFolder; - - AppConfig confcopy( *g_Conf ); - - try - { - PanelApplyList_t::iterator yay = PanelList.begin(); - while( yay != PanelList.end() ) - { - //DbgCon.Status( L"Writing settings for: " + (*yay)->GetLabel() ); - if( (pageid < 0) || (*yay)->IsOnPage( pageid ) ) - (*yay)->Apply(); - yay++; - } - - // If an exception is thrown above, this code below won't get run. - // (conveniently skipping any option application! :D) - - // Note: apply first, then save -- in case the apply fails. - - if( !PathDefs::GetSettings().Exists() ) - PathDefs::GetSettings().Mkdir(); - - if( !PathDefs::GetBios().Exists() ) - PathDefs::GetBios().Mkdir();//create the bios folder such that it can be opened at the first time wizard without an error message. - - AppApplySettings( &confcopy ); - } - catch( Exception::CannotApplySettings& ex ) - { - DocsFolderMode = oldDocsMode; - SettingsFolder = oldSettingsFolder; - UseDefaultSettingsFolder = oldUseDefSet; - *g_Conf = confcopy; - - if( ex.IsVerbose ) - { - Msgbox::Alert( StringUtil::UTF8StringToWxString(ex.FormatDisplayMessage()), "Cannot apply settings..." ); - - if( ex.GetPanel() != NULL ) - ex.GetPanel()->SetFocusToMe(); - } - - retval = false; - } - catch( ... ) - { - DocsFolderMode = oldDocsMode; - SettingsFolder = oldSettingsFolder; - UseDefaultSettingsFolder = oldUseDefSet; - *g_Conf = confcopy; - - throw; - } - - return retval; -} - -// Returns false if one of the panels fails input validation (in which case dialogs -// should not be closed, etc). -bool ApplyStateStruct::ApplyAll() -{ - return ApplyPage( -1 ); -} - -// -------------------------------------------------------------------------------------- -// BaseApplicableConfigPanel Implementations -// -------------------------------------------------------------------------------------- -IApplyState* BaseApplicableConfigPanel::FindApplyStateManager() const -{ - wxWindow* millrun = this->GetParent(); - while( millrun != NULL ) - { - if( BaseApplicableDialog* dialog = wxDynamicCast( millrun, BaseApplicableDialog ) ) - return (IApplyState*)dialog; - - if( ApplicableWizardPage* wizpage = wxDynamicCast( millrun, ApplicableWizardPage ) ) - return (IApplyState*)wizpage; - - millrun = millrun->GetParent(); - } - return NULL; -} - -BaseApplicableConfigPanel::~BaseApplicableConfigPanel() -{ - if( IApplyState* iapp = FindApplyStateManager() ) - iapp->GetApplyState().PanelList.remove( this ); -} - -BaseApplicableConfigPanel::BaseApplicableConfigPanel( wxWindow* parent, wxOrientation orient ) - : wxPanelWithHelpers( parent, orient ) - , m_AppStatusHelper( this ) -{ - Init(); -} - -BaseApplicableConfigPanel::BaseApplicableConfigPanel( wxWindow* parent, wxOrientation orient, const wxString& staticLabel ) - : wxPanelWithHelpers( parent, orient, staticLabel ) - , m_AppStatusHelper( this ) -{ - Init(); -} - -void BaseApplicableConfigPanel::SetFocusToMe() -{ - if( (m_OwnerBook == NULL) || (m_OwnerPage == wxID_NONE) ) return; - m_OwnerBook->SetSelection( m_OwnerPage ); -} - -void BaseApplicableConfigPanel::Init() -{ - // We need to bind to an event that occurs *after* all window and child - // window mess has been created. Unfortunately the WindowCreate event handler - // is immediate, and depends on the platform for how it "works", and thus - // useless. Solution: Create our own! :) - - //Bind( wxEVT_CREATE, &BaseApplicableConfigPanel::OnCreateWindow, this); - Bind(pxEvt_ApplySettings, &BaseApplicableConfigPanel::OnSettingsApplied, this); - - if( IApplyState* iapp = FindApplyStateManager() ) - { - ApplyStateStruct& applyState( iapp->GetApplyState() ); - m_OwnerPage = applyState.CurOwnerPage; - m_OwnerBook = applyState.ParentBook; - applyState.PanelList.push_back( this ); - } - - wxCommandEvent applyEvent( pxEvt_ApplySettings ); - applyEvent.SetId( GetId() ); - AddPendingEvent( applyEvent ); -} - -void BaseApplicableConfigPanel::OnSettingsApplied( wxCommandEvent& evt ) -{ - evt.Skip(); - if( evt.GetId() == GetId() ) AppStatusEvent_OnSettingsApplied(); -} - -void BaseApplicableConfigPanel::AppStatusEvent_OnSettingsApplied() {} - -void BaseApplicableConfigPanel::SomethingChanged() -{ - wxCommandEvent change(pxEvt_SomethingChanged); - AddPendingEvent(change); -} - - -BaseApplicableConfigPanel_SpecificConfig::BaseApplicableConfigPanel_SpecificConfig(wxWindow* parent, wxOrientation orient) - : BaseApplicableConfigPanel( parent, orient ) -{ -} - -BaseApplicableConfigPanel_SpecificConfig::BaseApplicableConfigPanel_SpecificConfig(wxWindow* parent, wxOrientation orient, const wxString& staticLabel ) - : BaseApplicableConfigPanel( parent, orient, staticLabel ) -{ -} - - diff --git a/pcsx2/gui/Panels/BiosSelectorPanel.cpp b/pcsx2/gui/Panels/BiosSelectorPanel.cpp deleted file mode 100644 index e110ce1803..0000000000 --- a/pcsx2/gui/Panels/BiosSelectorPanel.cpp +++ /dev/null @@ -1,227 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "ConfigurationPanels.h" - -#include "common/StringUtil.h" -#include "ps2/BiosTools.h" - -#include -#include -#include -#include - -using namespace pxSizerFlags; - -wxDECLARE_EVENT(pxEvt_BiosEnumerationFinished, wxCommandEvent); -wxDEFINE_EVENT(pxEvt_BiosEnumerationFinished, wxCommandEvent); - -// ===================================================================================================== -// BaseSelectorPanel -// ===================================================================================================== -// This base class provides event hookups and virtual functions for enumerating items in a folder. -// The most important feature of this base panel is that enumeration is done when the panel is first -// *shown*, not when it is created. This functionality allows the panel to work either as a stand alone -// dialog, a child of a complex tabbed dialog, and as a member of a wxWizard! -// -// In addition, this panel automatically intercepts and responds to DIRPICKER messages, so that your -// panel may provide a dir picker to the user. -// -// [TODO] : wxWidgets 2.9.1 provides a class for watching directory contents changes. When PCSX2 is -// upgraded to wx2.9/3.0, it should incorporate such functionality into this base class. (for now -// we just provide the user with a "refresh" button). -// -Panels::BaseSelectorPanel::BaseSelectorPanel(wxWindow* parent) - : BaseApplicableConfigPanel(parent, wxVERTICAL) -{ - Bind(wxEVT_DIRPICKER_CHANGED, &BaseSelectorPanel::OnFolderChanged, this); - Bind(wxEVT_SHOW, &BaseSelectorPanel::OnShow, this); -} - -void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt) -{ - evt.Skip(); - if (evt.IsShown()) - OnShown(); -} - -void Panels::BaseSelectorPanel::OnShown() -{ - if (!ValidateEnumerationStatus()) - DoRefresh(); -} - -bool Panels::BaseSelectorPanel::Show(bool visible) -{ - if (visible) - OnShown(); - - return BaseApplicableConfigPanel::Show(visible); -} - -void Panels::BaseSelectorPanel::RefreshSelections() -{ - ValidateEnumerationStatus(); - DoRefresh(); -} - -void Panels::BaseSelectorPanel::OnRefreshSelections(wxCommandEvent& evt) -{ - evt.Skip(); - RefreshSelections(); -} - -void Panels::BaseSelectorPanel::OnFolderChanged(wxFileDirPickerEvent& evt) -{ - evt.Skip(); - OnShown(); -} - -// ===================================================================================================== -// BiosSelectorPanel -// ===================================================================================================== -Panels::BiosSelectorPanel::BiosSelectorPanel(wxWindow* parent) - : BaseSelectorPanel(parent) -{ - SetMinWidth(480); - - m_ComboBox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_SORT | wxLB_NEEDED_SB); - m_FolderPicker = new DirPickerPanel(this, FolderId_Bios, - _("BIOS Search Path:"), // static box label - _("Select folder with PS2 BIOS roms") // dir picker popup label - ); - - m_ComboBox->SetFont(pxGetFixedFont(m_ComboBox->GetFont().GetPointSize() + 1)); - m_ComboBox->SetMinSize(wxSize(wxDefaultCoord, std::max(m_ComboBox->GetMinSize().GetHeight(), 96))); - - //if (InstallationMode != InstallMode_Portable) - m_FolderPicker->SetStaticDesc(_("Click the Browse button to select a different folder where PCSX2 will look for PS2 BIOS roms.")); - - wxButton* refreshButton = new wxButton(this, wxID_ANY, _("Refresh list")); - - *this += Label(_("Select a BIOS rom:")); - *this += m_ComboBox | StdExpand(); - *this += refreshButton | pxBorder(wxLEFT, StdPadding); - *this += 8; - *this += m_FolderPicker | StdExpand(); - - Bind(pxEvt_BiosEnumerationFinished, &BiosSelectorPanel::OnEnumComplete, this); - - Bind(wxEVT_BUTTON, &BiosSelectorPanel::OnRefreshSelections, this, refreshButton->GetId()); -} - -void Panels::BiosSelectorPanel::Apply() -{ - // User never visited this tab, so there's nothing to apply. - if (!m_BiosList) - return; - - int sel = m_ComboBox->GetSelection(); - if (sel == wxNOT_FOUND) - { - throw Exception::CannotApplySettings(this) - .SetDiagMsg("User did not specify a valid BIOS selection.") - .SetUserMsg("Please select a valid BIOS. If you are unable to make a valid selection then press Cancel to close the Configuration panel."); - } - - g_Conf->EmuOptions.BaseFilenames.Bios = StringUtil::wxStringToUTF8String(wxFileName((*m_BiosList)[(sptr)m_ComboBox->GetClientData(sel)]).GetFullName()); -} - -void Panels::BiosSelectorPanel::AppStatusEvent_OnSettingsApplied() -{ -} - -bool Panels::BiosSelectorPanel::ValidateEnumerationStatus() -{ - bool validated = true; - - // Impl Note: unique_ptr used so that resources get cleaned up if an exception - // occurs during file enumeration. - std::unique_ptr bioslist(new wxArrayString()); - - if (m_FolderPicker->GetPath().Exists()) - wxDir::GetAllFiles(m_FolderPicker->GetPath().ToString(), bioslist.get(), L"*.*", wxDIR_FILES); - - if (!m_BiosList || (*bioslist != *m_BiosList)) - validated = false; - - m_BiosList.swap(bioslist); - - int sel = m_ComboBox->GetSelection(); - if ((sel == wxNOT_FOUND) && !(m_ComboBox->IsEmpty())) - m_ComboBox->SetSelection(0); - - return validated; -} - -void Panels::BiosSelectorPanel::EnumThread::ExecuteTaskInThread() -{ - u32 region, version; - std::string description, zone; - for (size_t i = 0; i < m_parent.m_BiosList->GetCount(); ++i) - { - if (!IsBIOS((*m_parent.m_BiosList)[i].ToUTF8().data(), version, description, region, zone)) - continue; - Result.emplace_back(StringUtil::UTF8StringToWxString(description), i); - } - - wxCommandEvent done(pxEvt_BiosEnumerationFinished); - done.SetClientData(this); - m_parent.GetEventHandler()->AddPendingEvent(done); -} - -void Panels::BiosSelectorPanel::DoRefresh() -{ - m_ComboBox->Clear(); - if (!m_BiosList->size()) - return; - - m_ComboBox->Append(wxString("Enumerating BIOSes...")); - m_ComboBox->Update(); - - m_EnumeratorThread.reset(new EnumThread(*this)); - - m_EnumeratorThread->Start(); -} - -void Panels::BiosSelectorPanel::OnEnumComplete(wxCommandEvent& evt) -{ - auto enumThread = static_cast(evt.GetClientData()); - // Sanity check, in case m_BiosList was updated by ValidateEnumerationStatus() while the EnumThread was running - if (m_EnumeratorThread.get() != enumThread || m_BiosList->size() < enumThread->Result.size()) - return; - - const wxString currentBios(StringUtil::UTF8StringToWxString(g_Conf->EmuOptions.FullpathToBios())); - m_ComboBox->Clear(); // Clear the "Enumerating BIOSes..." - - for (const std::pair& result : enumThread->Result) - { - const int sel = m_ComboBox->Append(result.first, reinterpret_cast(static_cast(result.second))); - if (currentBios == (*m_BiosList)[result.second]) - m_ComboBox->SetSelection(sel); - } - // Select a bios if one isn't selected. - // This makes it so users don't _have_ to click on their bios, - // possibly reducing confusion. - if(m_ComboBox->GetSelection() == -1 && m_ComboBox->GetCount() > 0) - { - m_ComboBox->SetSelection(0); - } -}; - -Panels::BiosSelectorPanel::EnumThread::EnumThread(BiosSelectorPanel& parent) - : m_parent(parent){}; diff --git a/pcsx2/gui/Panels/ConfigurationPanels.h b/pcsx2/gui/Panels/ConfigurationPanels.h deleted file mode 100644 index 463e8ec637..0000000000 --- a/pcsx2/gui/Panels/ConfigurationPanels.h +++ /dev/null @@ -1,461 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -// All of the options screens in PCSX2 are implemented as panels which can be bound to -// either their own dialog boxes, or made into children of a paged Properties box. The -// paged Properties box is generally superior design, and there's a good chance we'll not -// want to deviate form that design anytime soon. But there's no harm in keeping nice -// encapsulation of panels regardless, just in case we want to shuffle things around. :) - -#pragma once - -#include -#include -#include - -#include "gui/AppCommon.h" -#include "gui/ApplyState.h" -#include "gui/i18n.h" - -namespace Panels -{ - // -------------------------------------------------------------------------------------- - // DirPickerPanel - // -------------------------------------------------------------------------------------- - // A simple panel which provides a specialized configurable directory picker with a - // "[x] Use Default setting" option, which enables or disables the panel. - // - class DirPickerPanel : public BaseApplicableConfigPanel - { - typedef BaseApplicableConfigPanel _parent; - - protected: - FoldersEnum_t m_FolderId; - wxDirPickerCtrl* m_pickerCtrl; - pxCheckBox* m_checkCtrl; - wxTextCtrl* m_textCtrl; - wxButton* b_explore; - - public: - DirPickerPanel(wxWindow* parent, FoldersEnum_t folderid, const wxString& label, const wxString& dialogLabel); - DirPickerPanel(wxWindow* parent, FoldersEnum_t folderid, const wxString& dialogLabel); - virtual ~DirPickerPanel() = default; - - void Reset(); - wxDirName GetPath() const; - void SetPath(const wxString& src); - - DirPickerPanel& SetStaticDesc(const wxString& msg); - DirPickerPanel& SetToolTip(const wxString& tip); - - wxWindowID GetId() const; - wxWindowID GetPanelId() const { return m_windowId; } - - // Overrides! - - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - bool Enable(bool enable = true); - - protected: - void Init(FoldersEnum_t folderid, const wxString& dialogLabel, bool isCompact); - void InitForPortableMode(const wxString& normalized); - void InitForRegisteredMode(const wxString& normalized, const wxString& dialogLabel, bool isCompact); - - void UseDefaultPath_Click(wxCommandEvent& event); - void Explore_Click(wxCommandEvent& event); - void UpdateCheckStatus(bool someNoteworthyBoolean); - }; - - // -------------------------------------------------------------------------------------- - // DocsFolderPickerPanel / LanguageSelectionPanel - // -------------------------------------------------------------------------------------- - class DocsFolderPickerPanel : public BaseApplicableConfigPanel - { - protected: - pxRadioPanel* m_radio_UserMode; - DirPickerPanel* m_dirpicker_custom; - - public: - virtual ~DocsFolderPickerPanel() = default; - DocsFolderPickerPanel(wxWindow* parent, bool isFirstTime = true); - - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - - DocsModeType GetDocsMode() const; - wxWindowID GetDirPickerId() const { return m_dirpicker_custom ? m_dirpicker_custom->GetId() : 0; } - - protected: - void OnRadioChanged(wxCommandEvent& evt); - }; - - class LanguageSelectionPanel : public BaseApplicableConfigPanel - { - protected: - LangPackList m_langs; - wxComboBox* m_picker; - - public: - virtual ~LanguageSelectionPanel() = default; - LanguageSelectionPanel(wxWindow* parent, bool showApply = true); - - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - - protected: - void OnApplyLanguage_Clicked(wxCommandEvent& evt); - }; - - // -------------------------------------------------------------------------------------- - // CpuPanelEE / CpuPanelVU : Sub Panels - // -------------------------------------------------------------------------------------- - - // -------------------------------------------------------------------------------------- - // BaseAdvancedCpuOptions - // -------------------------------------------------------------------------------------- - class BaseAdvancedCpuOptions : public BaseApplicableConfigPanel_SpecificConfig - { - - protected: - pxRadioPanel* m_RoundModePanel; - pxRadioPanel* m_ClampModePanel; - - public: - BaseAdvancedCpuOptions(wxWindow* parent); - virtual ~BaseAdvancedCpuOptions() = default; - - void RestoreDefaults(); - - protected: - void OnRestoreDefaults(wxCommandEvent& evt); - void ApplyRoundmode(SSE_MXCSR& mxcsr); - }; - - // -------------------------------------------------------------------------------------- - // AdvancedOptionsFPU / AdvancedOptionsVU - // -------------------------------------------------------------------------------------- - class AdvancedOptionsFPU : public BaseAdvancedCpuOptions - { - public: - AdvancedOptionsFPU(wxWindow* parent); - virtual ~AdvancedOptionsFPU() = default; - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - }; - - class AdvancedOptionsVU : public BaseAdvancedCpuOptions - { - public: - AdvancedOptionsVU(wxWindow* parent); - virtual ~AdvancedOptionsVU() = default; - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - }; - - // -------------------------------------------------------------------------------------- - // CpuPanelEE / CpuPanelVU : Actual Panels - // -------------------------------------------------------------------------------------- - class CpuPanelEE : public BaseApplicableConfigPanel_SpecificConfig - { - protected: - pxRadioPanel* m_panel_RecEE; - pxRadioPanel* m_panel_RecIOP; - pxCheckBox* m_check_EECacheEnable; - AdvancedOptionsFPU* m_advancedOptsFpu; - wxButton* m_button_RestoreDefaults; - - public: - CpuPanelEE(wxWindow* parent); - virtual ~CpuPanelEE() = default; - - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - - protected: - void OnRestoreDefaults(wxCommandEvent& evt); - void EECache_Event(wxCommandEvent& evt); - }; - - class CpuPanelVU : public BaseApplicableConfigPanel_SpecificConfig - { - protected: - pxRadioPanel* m_panel_VU0; - pxRadioPanel* m_panel_VU1; - Panels::AdvancedOptionsVU* m_advancedOptsVu; - wxButton* m_button_RestoreDefaults; - - public: - CpuPanelVU(wxWindow* parent); - virtual ~CpuPanelVU() = default; - - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - - protected: - void OnRestoreDefaults(wxCommandEvent& evt); - }; - - // -------------------------------------------------------------------------------------- - // FramelimiterPanel - // -------------------------------------------------------------------------------------- - class FramelimiterPanel : public BaseApplicableConfigPanel_SpecificConfig - { - protected: - pxCheckBox* m_check_LimiterDisable; - wxSpinCtrl* m_spin_NominalPct; - wxSpinCtrl* m_spin_SlomoPct; - wxSpinCtrl* m_spin_TurboPct; - - wxTextCtrl* m_text_BaseNtsc; - wxTextCtrl* m_text_BasePal; - - wxCheckBox* m_SkipperEnable; - wxCheckBox* m_TurboSkipEnable; - wxSpinCtrl* m_spin_SkipThreshold; - - public: - FramelimiterPanel(wxWindow* parent); - virtual ~FramelimiterPanel() = default; - - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - }; - - // -------------------------------------------------------------------------------------- - // GSWindowSettingsPanel - // -------------------------------------------------------------------------------------- - class GSWindowSettingsPanel : public BaseApplicableConfigPanel_SpecificConfig - { - protected: - // Exclusive mode is currently not used (true for svn r4399). - // PCSX2 has partial infrastructure for it: - // - GS seem to support it (it supports the API and has implementation), but I don't know if it ever got called. - // - BUT, the configuration (AppConfig, and specifically GSWindowOptions) do NOT seem to have a place to store this value, - // and PCSX2's code doesn't seem to use this API anywhere. So, no exclusive mode for now. - // - avih - - wxComboBox* m_combo_AspectRatio; - wxComboBox* m_combo_FMVAspectRatioSwitch; - wxComboBox* m_combo_vsync; - - pxCheckBox* m_check_CloseGS; - pxCheckBox* m_check_SizeLock; - pxCheckBox* m_check_VsyncEnable; - pxCheckBox* m_check_Fullscreen; - - pxCheckBox* m_check_HideMouse; - pxCheckBox* m_check_DclickFullscreen; - - wxTextCtrl* m_text_WindowWidth; - wxTextCtrl* m_text_WindowHeight; - - public: - GSWindowSettingsPanel(wxWindow* parent); - virtual ~GSWindowSettingsPanel() = default; - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - }; - - class VideoPanel : public BaseApplicableConfigPanel_SpecificConfig - { - protected: - pxCheckBox* m_check_SynchronousGS; - wxSpinCtrl* m_spinner_VsyncQueue; - wxButton* m_restore_defaults; - FramelimiterPanel* m_fpan; - - public: - VideoPanel(wxWindow* parent); - virtual ~VideoPanel() = default; - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void Defaults_Click(wxCommandEvent& evt); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - - protected: - void OnOpenWindowSettings(wxCommandEvent& evt); - }; - - // -------------------------------------------------------------------------------------- - // SpeedHacksPanel - // -------------------------------------------------------------------------------------- - class SpeedHacksPanel : public BaseApplicableConfigPanel_SpecificConfig - { - protected: - wxBoxSizer* m_sizer; - wxFlexGridSizer* s_table; - - pxCheckBox* m_check_Enable; - wxButton* m_button_Defaults; - - wxPanelWithHelpers* m_eeRateSliderPanel; - wxPanelWithHelpers* m_eeSkipSliderPanel; - wxSlider* m_slider_eeRate; - wxSlider* m_slider_eeSkip; - pxStaticText* m_msg_eeRate; - pxStaticText* m_msg_eeSkip; - - pxCheckBox* m_check_intc; - pxCheckBox* m_check_waitloop; - pxCheckBox* m_check_fastCDVD; - pxCheckBox* m_check_vuFlagHack; - pxCheckBox* m_check_vuThread; - pxCheckBox* m_check_vu1Instant; - - public: - virtual ~SpeedHacksPanel() = default; - SpeedHacksPanel(wxWindow* parent); - void Apply(); - void EnableStuff(AppConfig* configToUse = NULL); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - - protected: - const wxChar* GetEECycleRateSliderMsg(int val); - const wxChar* GetEECycleSkipSliderMsg(int val); - void SetEEcycleSliderMsg(); - void SetVUcycleSliderMsg(); - - void OnEnable_Toggled(wxCommandEvent& evt); - void Defaults_Click(wxCommandEvent& evt); - void EECycleRate_Scroll(wxScrollEvent& event); - void VUCycleRate_Scroll(wxScrollEvent& event); - }; - - // -------------------------------------------------------------------------------------- - // GameFixesPanel - // -------------------------------------------------------------------------------------- - class GameFixesPanel : public BaseApplicableConfigPanel_SpecificConfig - { - protected: - pxCheckBox* m_checkbox[GamefixId_COUNT]; - pxCheckBox* m_check_Enable; - - public: - GameFixesPanel(wxWindow* parent); - virtual ~GameFixesPanel() = default; - void EnableStuff(AppConfig* configToUse = NULL); - void OnEnable_Toggled(wxCommandEvent& evt); - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - void ApplyConfigToGui(AppConfig& configToApply, int flags = 0); - }; - - class SettingsDirPickerPanel : public DirPickerPanel - { - public: - SettingsDirPickerPanel(wxWindow* parent); - }; - - // -------------------------------------------------------------------------------------- - // StandardPathsPanel - // -------------------------------------------------------------------------------------- - class StandardPathsPanel : public BaseApplicableConfigPanel - { - public: - StandardPathsPanel(wxWindow* parent); - void Apply(); - void AppStatusEvent_OnSettingsApplied(); - }; - - // -------------------------------------------------------------------------------------- - // BaseSelectorPanel - // -------------------------------------------------------------------------------------- - class BaseSelectorPanel : public BaseApplicableConfigPanel - { - typedef BaseApplicableConfigPanel _parent; - - public: - virtual ~BaseSelectorPanel() = default; - BaseSelectorPanel(wxWindow* parent); - - virtual void RefreshSelections(); - - virtual bool Show(bool visible = true); - virtual void OnShown(); - virtual void OnFolderChanged(wxFileDirPickerEvent& evt); - - protected: - void OnRefreshSelections(wxCommandEvent& evt); - - // This method is called when the enumeration contents have changed. The implementing - // class should populate or re-populate listbox/selection components when invoked. - // - virtual void DoRefresh() = 0; - - // This method is called when an event has indicated that the enumeration status of the - // selector may have changed. The implementing class should re-enumerate the folder/source - // data and return either TRUE (enumeration status unchanged) or FALSE (enumeration status - // changed). - // - // If the implementation returns FALSE, then the BaseSelectorPanel will invoke a call to - // DoRefresh() [which also must be implemented] - // - virtual bool ValidateEnumerationStatus() = 0; - - void OnShow(wxShowEvent& evt); - }; - - // -------------------------------------------------------------------------------------- - // BiosSelectorPanel - // -------------------------------------------------------------------------------------- - class BiosSelectorPanel : public BaseSelectorPanel - { - protected: - std::unique_ptr m_BiosList; - wxListBox* m_ComboBox; - DirPickerPanel* m_FolderPicker; - - public: - BiosSelectorPanel(wxWindow* parent); - virtual ~BiosSelectorPanel() = default; - - class EnumThread : public Threading::pxThread - { - public: - std::vector> Result; - - virtual ~EnumThread() - { - try - { - pxThread::Cancel(); - } - DESTRUCTOR_CATCHALL - } - EnumThread(BiosSelectorPanel& parent); - - protected: - void ExecuteTaskInThread(); - BiosSelectorPanel& m_parent; - }; - - protected: - virtual void Apply(); - virtual void AppStatusEvent_OnSettingsApplied(); - virtual void DoRefresh(); - virtual void OnEnumComplete(wxCommandEvent& evt); - virtual bool ValidateEnumerationStatus(); - - std::unique_ptr m_EnumeratorThread; - }; -} // namespace Panels diff --git a/pcsx2/gui/Panels/CpuPanel.cpp b/pcsx2/gui/Panels/CpuPanel.cpp deleted file mode 100644 index 4e2c09c59c..0000000000 --- a/pcsx2/gui/Panels/CpuPanel.cpp +++ /dev/null @@ -1,398 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ConfigurationPanels.h" - -using namespace pxSizerFlags; - -Panels::BaseAdvancedCpuOptions::BaseAdvancedCpuOptions( wxWindow* parent ) - : BaseApplicableConfigPanel_SpecificConfig( parent ) -{ - wxStaticBoxSizer* s_round( new wxStaticBoxSizer( wxVERTICAL, this, _("Round Mode") ) ); - wxStaticBoxSizer* s_clamp( new wxStaticBoxSizer( wxVERTICAL, this, _("Clamping Mode") ) ); - - const RadioPanelItem RoundModeChoices[] = - { - RadioPanelItem(_("Nearest")), - RadioPanelItem(_("Negative")), - RadioPanelItem(_("Positive")), - RadioPanelItem(_("Chop / Zero")) - }; - - const RadioPanelItem ClampModeChoices[] = - { - RadioPanelItem(_("None")), - RadioPanelItem(_("Normal")), - }; - - m_RoundModePanel = new pxRadioPanel( this, RoundModeChoices ); - m_ClampModePanel = new pxRadioPanel( this, ClampModeChoices ); - - // Highlight Default Options: - - m_RoundModePanel->SetDefaultItem( 3 ); - m_ClampModePanel->SetDefaultItem( 1 ); - - // --------------------------------- - // The Fitting And Sizing Area - // --------------------------------- - - wxFlexGridSizer& grid = *new wxFlexGridSizer( 4 ); - - // Clever proportions selected for a fairly nice spacing. - - grid.AddGrowableCol( 0, 22 ); // round mode box size - grid.AddGrowableCol( 1, 22 ); // clamp mode box size - - *s_round+= m_RoundModePanel | StdExpand(); - *s_clamp+= m_ClampModePanel | StdExpand(); - - grid += s_round | SubGroup(); - grid += s_clamp | SubGroup(); - - *this += grid | StdExpand(); -} - -void Panels::BaseAdvancedCpuOptions::OnRestoreDefaults(wxCommandEvent& evt) -{ - RestoreDefaults(); - evt.Skip(); -} - -void Panels::BaseAdvancedCpuOptions::RestoreDefaults() -{ - AppConfig def; // created with default values - def.EnablePresets = false; // disable presets otherwise it'll disable some widgets - ApplyConfigToGui(def); -} - -Panels::AdvancedOptionsFPU::AdvancedOptionsFPU( wxWindow* parent ) - : BaseAdvancedCpuOptions( parent ) -{ - SetName( L"AdvancedOptionsFPU" ); - AddFrame(_("EE/FPU Advanced Recompiler Options")); - - m_ClampModePanel->Append(_("Extra + Preserve Sign")); - m_ClampModePanel->Append(_("Full")); - - m_RoundModePanel->Realize(); - m_ClampModePanel->Realize(); -} - - -Panels::AdvancedOptionsVU::AdvancedOptionsVU( wxWindow* parent ) - : BaseAdvancedCpuOptions( parent ) -{ - SetName( L"AdvancedOptionsVU" ); - AddFrame(_("VU0 / VU1 Advanced Recompiler Options")); - - m_ClampModePanel->Append(_("Extra")); - m_ClampModePanel->Append(_("Extra + Preserve Sign")); - - m_RoundModePanel->Realize(); - m_ClampModePanel->Realize(); -} - -Panels::CpuPanelEE::CpuPanelEE( wxWindow* parent ) - : BaseApplicableConfigPanel_SpecificConfig( parent ) -{ - *this += Text( pxE(L"Notice: Most games are fine with the default options.") - ) | StdExpand(); - - const RadioPanelItem tbl_CpuTypes_EE[] = - { - RadioPanelItem(_("Interpreter")) - .SetToolTip(_("Quite possibly the slowest thing in the universe.")), - - RadioPanelItem(_("Recompiler")) - .SetToolTip(_("Performs just-in-time binary translation of 64-bit MIPS-IV machine code to x86.")) - }; - - const RadioPanelItem tbl_CpuTypes_IOP[] = - { - RadioPanelItem(_("Interpreter")) - .SetToolTip(_("Pretty slow; provided for diagnostic purposes only.")), - - RadioPanelItem(_("Recompiler")) - .SetToolTip(_("Performs just-in-time binary translation of 32-bit MIPS-I machine code to x86.")) - }; - - - m_panel_RecEE = &(new pxRadioPanel( this, tbl_CpuTypes_EE ))->SetDefaultItem( 1 ); - m_panel_RecIOP = &(new pxRadioPanel( this, tbl_CpuTypes_IOP ))->SetDefaultItem( 1 ); - - m_panel_RecEE->Realize(); - m_panel_RecIOP->Realize(); - - // --------------------------------- - // The Fitting And Sizing Area - // --------------------------------- - - wxFlexGridSizer& s_recs( *new wxFlexGridSizer( 2 ) ); - - s_recs.AddGrowableCol( 0, 1 ); - s_recs.AddGrowableCol( 1, 1 ); - - // i18n: No point in translating PS2 CPU names :) - wxStaticBoxSizer& s_ee ( *new wxStaticBoxSizer( wxVERTICAL, this, L"EmotionEngine" ) ); - wxStaticBoxSizer& s_iop ( *new wxStaticBoxSizer( wxVERTICAL, this, L"IOP" ) ); - - s_ee += m_panel_RecEE | StdExpand(); - s_ee += m_check_EECacheEnable = &(new pxCheckBox( this, _("Enable EE Cache (Slower)") ))->SetToolTip(_("Interpreter only; provided for diagnostic")); - s_iop += m_panel_RecIOP | StdExpand(); - - s_recs += s_ee | SubGroup(); - s_recs += s_iop | SubGroup(); - - - *this += &s_recs | StdExpand(); - - // move following line down so EE and VU panels look more uniform. - // Use an empty Label (std expanded) so it work with custom font sizes, too. - //*this += Label(_("")) | StdExpand(); - *this += new wxStaticLine( this ) | pxExpand.Border(wxALL, 18); - *this += (m_advancedOptsFpu = new AdvancedOptionsFPU( this )) | StdExpand(); - - *this += 12; - m_button_RestoreDefaults = new wxButton(this, wxID_DEFAULT, _("Restore Defaults")); - *this += m_button_RestoreDefaults | StdButton(); - - Bind(wxEVT_BUTTON, &CpuPanelEE::OnRestoreDefaults, this, wxID_DEFAULT); - Bind(wxEVT_RADIOBUTTON, &CpuPanelEE::EECache_Event, this); -} - -Panels::CpuPanelVU::CpuPanelVU( wxWindow* parent ) - : BaseApplicableConfigPanel_SpecificConfig( parent ) -{ - *this += Text( pxE( L"Notice: Most games are fine with the default options.") - ) | StdExpand(); - - const RadioPanelItem tbl_CpuTypes_VU[] = - { - RadioPanelItem(_("Interpreter")) - .SetToolTip(_("Vector Unit Interpreter. Slow and not very compatible. Only use for diagnostics.")), - - RadioPanelItem(_("microVU Recompiler")) - .SetToolTip(_("New Vector Unit recompiler with much improved compatibility. Recommended.")) - }; - - m_panel_VU0 = &(new pxRadioPanel( this, tbl_CpuTypes_VU )) ->SetDefaultItem( 1 ); - m_panel_VU1 = &(new pxRadioPanel( this, tbl_CpuTypes_VU )) ->SetDefaultItem( 1 ); - - m_panel_VU0->Realize(); - m_panel_VU1->Realize(); - - // --------------------------------- - // The Fitting And Sizing Area - // --------------------------------- - - wxFlexGridSizer& s_recs( *new wxFlexGridSizer( 2 ) ); - - s_recs.AddGrowableCol( 0, 1 ); - s_recs.AddGrowableCol( 1, 1 ); - - wxStaticBoxSizer& s_vu0( *new wxStaticBoxSizer( wxVERTICAL, this, L"VU0" ) ); - wxStaticBoxSizer& s_vu1( *new wxStaticBoxSizer( wxVERTICAL, this, L"VU1" ) ); - - s_vu0 += m_panel_VU0 | StdExpand(); - s_vu1 += m_panel_VU1 | StdExpand(); - - s_recs += s_vu0 | SubGroup(); - s_recs += s_vu1 | SubGroup(); - - *this += &s_recs | StdExpand(); - *this += new wxStaticLine( this ) | pxExpand.Border(wxALL, 18); - *this += ( m_advancedOptsVu=new AdvancedOptionsVU( this )) | StdExpand(); - - *this += 12; - m_button_RestoreDefaults = new wxButton(this, wxID_DEFAULT, _("Restore Defaults")); - *this += m_button_RestoreDefaults | StdButton(); - - Bind(wxEVT_BUTTON, &CpuPanelVU::OnRestoreDefaults, this, wxID_DEFAULT); -} - -void Panels::CpuPanelEE::Apply() -{ - Pcsx2Config::RecompilerOptions& recOps( g_Conf->EmuOptions.Cpu.Recompiler ); - recOps.EnableEE = !!m_panel_RecEE->GetSelection(); - recOps.EnableIOP = !!m_panel_RecIOP->GetSelection(); - recOps.EnableEECache = m_check_EECacheEnable->GetValue(); -} - -void Panels::CpuPanelEE::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui( *g_Conf ); -} - -void Panels::CpuPanelEE::ApplyConfigToGui( AppConfig& configToApply, int flags ) -{ - const Pcsx2Config::RecompilerOptions& recOps( configToApply.EmuOptions.Cpu.Recompiler ); - m_panel_RecEE->SetSelection( (int)recOps.EnableEE ); - m_panel_RecIOP->SetSelection( (int)recOps.EnableIOP ); - - m_panel_RecEE->Enable(!configToApply.EnablePresets); - m_panel_RecIOP->Enable(!configToApply.EnablePresets); - - //EECache option is exclusive to the EE Interpreter. - m_check_EECacheEnable->SetValue(recOps.EnableEECache); - m_check_EECacheEnable->Enable(!configToApply.EnablePresets && m_panel_RecEE->GetSelection() == 0); - m_button_RestoreDefaults->Enable(!configToApply.EnablePresets); - - if( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ) - { - m_advancedOptsFpu->ApplyConfigToGui( configToApply, true ); - } -} - -void Panels::CpuPanelEE::OnRestoreDefaults(wxCommandEvent &evt) -{ - AppConfig def; // created with default values - def.EnablePresets = false; // disable presets otherwise it'll disable some widgets - ApplyConfigToGui(def); - - if( BaseAdvancedCpuOptions* opts = (BaseAdvancedCpuOptions*)FindWindowByName(L"AdvancedOptionsFPU") ) - opts->RestoreDefaults(); - - evt.Skip(); -} - - -void Panels::CpuPanelVU::Apply() -{ - Pcsx2Config::RecompilerOptions& recOps( g_Conf->EmuOptions.Cpu.Recompiler ); - recOps.EnableVU0 = m_panel_VU0->GetSelection() > 0; - recOps.EnableVU1 = m_panel_VU1->GetSelection() > 0; -} - -void Panels::CpuPanelVU::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui( *g_Conf ); -} - -void Panels::CpuPanelVU::ApplyConfigToGui( AppConfig& configToApply, int flags ) -{ - Pcsx2Config::RecompilerOptions& recOps( configToApply.EmuOptions.Cpu.Recompiler ); - m_panel_VU0->SetSelection( recOps.EnableVU0 ? 1 : 0 ); - m_panel_VU1->SetSelection( recOps.EnableVU1 ? 1 : 0 ); - m_panel_VU0->Enable(!configToApply.EnablePresets); - m_panel_VU1->Enable(!configToApply.EnablePresets); - m_button_RestoreDefaults->Enable(!configToApply.EnablePresets); - - if ( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ) - { - m_advancedOptsVu->ApplyConfigToGui( configToApply, true ); - } -} - - -void Panels::CpuPanelVU::OnRestoreDefaults(wxCommandEvent &evt) -{ - AppConfig def; // created with default values - def.EnablePresets = false; // disable presets otherwise it'll disable some widgets - ApplyConfigToGui(def); - - if( BaseAdvancedCpuOptions* opts = (BaseAdvancedCpuOptions*)FindWindowByName(L"AdvancedOptionsVU") ) - opts->RestoreDefaults(); - - evt.Skip(); -} - -void Panels::BaseAdvancedCpuOptions::ApplyRoundmode( SSE_MXCSR& mxcsr ) -{ - mxcsr.RoundingControl = m_RoundModePanel->GetSelection(); - mxcsr.DenormalsAreZero = 1; - mxcsr.FlushToZero = 1; -} - -void Panels::AdvancedOptionsFPU::Apply() -{ - Pcsx2Config::CpuOptions& cpuOps( g_Conf->EmuOptions.Cpu ); - Pcsx2Config::RecompilerOptions& recOps( cpuOps.Recompiler ); - - cpuOps.sseMXCSR = Pcsx2Config::CpuOptions().sseMXCSR; // set default - ApplyRoundmode( cpuOps.sseMXCSR ); - - const int clampSel = m_ClampModePanel->GetSelection(); - - recOps.fpuOverflow = clampSel >= 1; - recOps.fpuExtraOverflow = clampSel >= 2; - recOps.fpuFullMode = clampSel >= 3; - - cpuOps.ApplySanityCheck(); -} - -void Panels::AdvancedOptionsFPU::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui( *g_Conf ); -} - -void Panels::AdvancedOptionsFPU::ApplyConfigToGui( AppConfig& configToApply, int flags ) -{ - const Pcsx2Config::CpuOptions& cpuOps( configToApply.EmuOptions.Cpu ); - const Pcsx2Config::RecompilerOptions& recOps( cpuOps.Recompiler ); - - m_RoundModePanel->SetSelection( cpuOps.sseMXCSR.RoundingControl ); - - if( recOps.fpuFullMode ) m_ClampModePanel->SetSelection( 3 ); - else if( recOps.fpuExtraOverflow ) m_ClampModePanel->SetSelection( 2 ); - else if( recOps.fpuOverflow ) m_ClampModePanel->SetSelection( 1 ); - else m_ClampModePanel->SetSelection( 0 ); - - this->Enable(!configToApply.EnablePresets); -} - -void Panels::AdvancedOptionsVU::Apply() -{ - Pcsx2Config::CpuOptions& cpuOps( g_Conf->EmuOptions.Cpu ); - Pcsx2Config::RecompilerOptions& recOps( cpuOps.Recompiler ); - - cpuOps.sseVUMXCSR = Pcsx2Config::CpuOptions().sseVUMXCSR; // set default - ApplyRoundmode( cpuOps.sseVUMXCSR ); - - const int clampSel = m_ClampModePanel->GetSelection(); - - recOps.vuOverflow = clampSel >= 1; - recOps.vuExtraOverflow = clampSel >= 2; - recOps.vuSignOverflow = clampSel >= 3; - - cpuOps.ApplySanityCheck(); -} - -void Panels::AdvancedOptionsVU::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui( *g_Conf ); -} - -void Panels::AdvancedOptionsVU::ApplyConfigToGui( AppConfig& configToApply, int flags ) -{ - const Pcsx2Config::CpuOptions& cpuOps( configToApply.EmuOptions.Cpu ); - const Pcsx2Config::RecompilerOptions& recOps( cpuOps.Recompiler ); - - m_RoundModePanel->SetSelection( cpuOps.sseVUMXCSR.RoundingControl ); - - if( recOps.vuSignOverflow ) m_ClampModePanel->SetSelection( 3 ); - else if( recOps.vuExtraOverflow ) m_ClampModePanel->SetSelection( 2 ); - else if( recOps.vuOverflow ) m_ClampModePanel->SetSelection( 1 ); - else m_ClampModePanel->SetSelection( 0 ); - - this->Enable(!configToApply.EnablePresets); -} - -void Panels::CpuPanelEE::EECache_Event(wxCommandEvent& event) -{ - m_check_EECacheEnable->Enable(m_panel_RecEE->GetSelection() == 0); - event.Skip(); -} diff --git a/pcsx2/gui/Panels/DirPickerPanel.cpp b/pcsx2/gui/Panels/DirPickerPanel.cpp deleted file mode 100644 index 97e59c8e7e..0000000000 --- a/pcsx2/gui/Panels/DirPickerPanel.cpp +++ /dev/null @@ -1,298 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ConfigurationPanels.h" -#include "gui/Dialogs/ModalPopups.h" - -#include -#include -#include -#include - -using namespace pxSizerFlags; - -static wxString GetNormalizedConfigFolder( FoldersEnum_t folderId ) -{ - return Path::Normalize( g_Conf->Folders.IsDefault( folderId ) ? PathDefs::Get(folderId) : g_Conf->Folders[folderId] ); -} - -// Pass me TRUE if the default path is to be used, and the DirPickerCtrl disabled from use. -void Panels::DirPickerPanel::UpdateCheckStatus( bool someNoteworthyBoolean ) -{ - if (!m_pickerCtrl) return; - - m_pickerCtrl->Enable( !someNoteworthyBoolean ); - if (someNoteworthyBoolean) - { - wxString normalized( Path::Normalize( PathDefs::Get( m_FolderId ) ) ); - m_pickerCtrl->SetPath( normalized ); - - wxFileDirPickerEvent event( m_pickerCtrl->GetEventType(), m_pickerCtrl, m_pickerCtrl->GetId(), normalized ); - m_pickerCtrl->GetEventHandler()->ProcessEvent(event); - } -} - -void Panels::DirPickerPanel::UseDefaultPath_Click( wxCommandEvent &evt ) -{ - evt.Skip(); - pxAssert( (m_pickerCtrl != NULL) && (m_checkCtrl != NULL) ); - UpdateCheckStatus( m_checkCtrl ? m_checkCtrl->IsChecked() : false ); -} - -void Panels::DirPickerPanel::Explore_Click( wxCommandEvent &evt ) -{ - wxDirName path( GetPath() ); - - if (!pxAssertDev( path.IsOk(), "This DirPickerPanel could not find valid or meaningful path data." )) - return; - - if (!path.Exists()) - { - wxDialogWithHelpers createPathDlg( NULL, _("Path does not exist") ); - createPathDlg.SetMinWidth( 600 ); - - createPathDlg += createPathDlg.Label( path.ToString() ) | StdCenter(); - - createPathDlg += createPathDlg.Heading( pxE( L"The specified path/directory does not exist. Would you like to create it?" ) - ); - - wxWindowID result = pxIssueConfirmation( createPathDlg, - MsgButtons().Custom(_("Create"), "create").Cancel(), - L"DirPicker:CreateOnExplore" - ); - - if( result == wxID_CANCEL ) return; - path.Mkdir(); - } - - wxLaunchDefaultApplication(path.ToString()); -} - -// There are two constructors. See the details for the 'label' parameter below for details. -// -// Parameters: -// label - label for the StaticBox that surrounds the dir picker control. If the 'label' -// parameter is not specified, the layout of the panel is assumed to be "compact" which -// lacks a static box and compresses itself onto a single line. Compact mode may be useful -// for situations where the expanded format is just too invasive. -// -Panels::DirPickerPanel::DirPickerPanel( wxWindow* parent, FoldersEnum_t folderid, const wxString& label, const wxString& dialogLabel ) - : BaseApplicableConfigPanel( parent, wxVERTICAL, label ) -{ - Init( folderid, dialogLabel, false ); -} - -Panels::DirPickerPanel::DirPickerPanel( wxWindow* parent, FoldersEnum_t folderid, const wxString& dialogLabel ) - : BaseApplicableConfigPanel( parent, wxVERTICAL ) -{ - Init( folderid, dialogLabel, true ); -} - -void Panels::DirPickerPanel::Init( FoldersEnum_t folderid, const wxString& dialogLabel, bool isCompact ) -{ - m_FolderId = folderid; - m_pickerCtrl = NULL; - m_checkCtrl = NULL; - m_textCtrl = NULL; - b_explore = NULL; - - wxString normalized (GetNormalizedConfigFolder( m_FolderId )); - - if (wxFile::Exists( normalized )) - { - // The default path is invalid... What should we do here? hmm.. - } - -// if (InstallationMode == InstallMode_Portable) -// InitForPortableMode(normalized); -// else - InitForRegisteredMode(normalized, dialogLabel, isCompact); - - // wx warns when paths don't exist, but this is typically normal when the wizard - // creates its child controls. So let's ignore them. - wxDoNotLogInThisScope please; - AppStatusEvent_OnSettingsApplied(); // forces default settings based on g_Conf -} - - -// InitForPortableMode is currently unused because portable now allows fully custom folders. -void Panels::DirPickerPanel::InitForPortableMode( const wxString& normalized ) -{ - // In portable mode the path is unchangeable, and only a "open in explorer" button is provided (which - // itself is windows-only at this time). - - m_textCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - - wxFlexGridSizer& s_lower( *new wxFlexGridSizer( 2, 0, StdPadding ) ); - s_lower.AddGrowableCol( 0, 1 ); - - s_lower += m_textCtrl | pxExpand; - if (b_explore) - s_lower += b_explore; - - *this += s_lower | pxExpand.Border(wxLEFT | wxRIGHT, StdPadding); - - m_textCtrl->Disable(); -} - -void Panels::DirPickerPanel::InitForRegisteredMode( const wxString& normalized, const wxString& dialogLabel, bool isCompact ) -{ - if (!isCompact) - { - m_checkCtrl = new pxCheckBox( this, _("Use default setting") ); - - pxSetToolTip( m_checkCtrl, pxEt( L"When checked this folder will automatically reflect the default associated with PCSX2's current usermode setting. " ) - ); - - Bind(wxEVT_CHECKBOX, &DirPickerPanel::UseDefaultPath_Click, this, m_checkCtrl->GetId()); - } - - // Force the Dir Picker to use a text control. This isn't standard on Linux/GTK but it's much - // more usable, so to hell with standards. - - m_pickerCtrl = new wxDirPickerCtrl( this, wxID_ANY, wxEmptyString, dialogLabel, - wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL | wxDIRP_DIR_MUST_EXIST - ); - -#ifndef __WXGTK__ - // GTK+ : The wx implementation of Explore isn't reliable, so let's not even put the - // button on the dialogs for now. - - wxButton* b_explore( new wxButton( this, wxID_ANY, _("Open in Explorer") ) ); - pxSetToolTip( b_explore, _("Open an explorer window to this folder.") ); - Bind(wxEVT_BUTTON, &DirPickerPanel::Explore_Click, this, b_explore->GetId()); -#endif - - if (isCompact) - { - wxFlexGridSizer& s_compact( *new wxFlexGridSizer( 2, 0, 4 ) ); - s_compact.AddGrowableCol( 0 ); - s_compact += m_pickerCtrl | pxExpand; -#ifndef __WXGTK__ - s_compact += b_explore; -#endif - *this += s_compact | pxExpand; - } - else - { - wxBoxSizer& s_lower( *new wxBoxSizer( wxHORIZONTAL ) ); - - s_lower += m_checkCtrl | pxMiddle; - if (b_explore) - { - s_lower += pxStretchSpacer(1); - s_lower += b_explore; - } - - *this += m_pickerCtrl | pxExpand.Border(wxLEFT | wxRIGHT | wxTOP, StdPadding); - *this += s_lower | pxExpand.Border(wxLEFT | wxRIGHT, StdPadding); - } -} - -Panels::DirPickerPanel& Panels::DirPickerPanel::SetStaticDesc( const wxString& msg ) -{ - GetSizer()->Insert( 0, &Heading( msg ), pxExpand ); - return *this; -} - -Panels::DirPickerPanel& Panels::DirPickerPanel::SetToolTip( const wxString& tip ) -{ - pxSetToolTip( this, tip ); - return *this; -} - -wxWindowID Panels::DirPickerPanel::GetId() const -{ - return m_pickerCtrl->GetId(); -} - -void Panels::DirPickerPanel::Reset() -{ - const bool isDefault = g_Conf->Folders.IsDefault( m_FolderId ); - - if (m_checkCtrl) - m_checkCtrl->SetValue( isDefault ); - - if (m_pickerCtrl) - { - // Important! The dirpicker panel stuff, due to however it's put together - // needs to check the enable status of this panel before setting the child - // panel's enable status. - - m_pickerCtrl->Enable( IsEnabled() ? ( m_checkCtrl ? !isDefault : true ) : false ); - m_pickerCtrl->SetPath( GetNormalizedConfigFolder( m_FolderId ) ); - } - - if (m_textCtrl) - { - m_textCtrl->Disable(); - m_textCtrl->SetValue( GetNormalizedConfigFolder( m_FolderId ) ); - } -} - -bool Panels::DirPickerPanel::Enable( bool enable ) -{ - if (m_pickerCtrl) - m_pickerCtrl->Enable( enable ? (!m_checkCtrl || m_checkCtrl->GetValue()) : false ); - - return _parent::Enable( enable ); -} - - -void Panels::DirPickerPanel::AppStatusEvent_OnSettingsApplied() -{ - Reset(); -} - -void Panels::DirPickerPanel::Apply() -{ - wxDirName path( GetPath() ); - - if (!path.Exists()) - { - wxDialogWithHelpers dialog( NULL, _("Create folder?") ); - dialog += dialog.Heading(AddAppName(_("A configured folder does not exist. Should %s try to create it?"))); - dialog += 12; - dialog += dialog.Heading( path.ToString() ); - - if( wxID_CANCEL == pxIssueConfirmation( dialog, MsgButtons().Custom(_("Create"), "create").Cancel(), L"CreateNewFolder" ) ) - throw Exception::CannotApplySettings( this ); - } - - path.Mkdir(); - g_Conf->Folders.Set( m_FolderId, path.ToString(), m_checkCtrl ? m_checkCtrl->GetValue() : false ); -} - -wxDirName Panels::DirPickerPanel::GetPath() const -{ - // The (x) ? y : z construct doesn't like y and z to be different types in gcc. - if (m_pickerCtrl) - return wxDirName(m_pickerCtrl->GetPath()); - - if (m_textCtrl) - return wxDirName(m_textCtrl->GetValue()); - - return wxDirName(wxEmptyString); -} - -void Panels::DirPickerPanel::SetPath( const wxString& newPath ) -{ - if (m_pickerCtrl) - m_pickerCtrl->SetPath( newPath ); - - if (m_textCtrl) - m_textCtrl->SetValue( newPath ); -} diff --git a/pcsx2/gui/Panels/GSWindowPanel.cpp b/pcsx2/gui/Panels/GSWindowPanel.cpp deleted file mode 100644 index f7fee0f7f2..0000000000 --- a/pcsx2/gui/Panels/GSWindowPanel.cpp +++ /dev/null @@ -1,194 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ConfigurationPanels.h" - -#include "fmt/core.h" -#include "gui/App.h" -#include "gui/AppAccelerators.h" - -using namespace pxSizerFlags; - -// -------------------------------------------------------------------------------------- -// GSWindowSetting Implementation -// -------------------------------------------------------------------------------------- - -Panels::GSWindowSettingsPanel::GSWindowSettingsPanel(wxWindow* parent) - : BaseApplicableConfigPanel_SpecificConfig(parent) -{ - const wxString aspect_ratio_labels[] = - { - _("Fit to Window/Screen"), - _("Auto Standard (4:3/3:2 Progressive)"), - _("Standard (4:3)"), - _("Widescreen (16:9)")}; - - const wxString fmv_aspect_ratio_switch_labels[] = - { - _("Off (Default)"), - _("Auto Standard (4:3/3:2 Progressive)"), - _("Standard (4:3)"), - _("Widescreen (16:9)")}; - - // Warning must match the order of the VsyncMode Enum - const wxString vsync_label[] = - { - _("Disabled"), - _("Standard"), - _("Adaptive"), - }; - - m_combo_AspectRatio = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - std::size(aspect_ratio_labels), aspect_ratio_labels, wxCB_READONLY); - - m_combo_FMVAspectRatioSwitch = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - std::size(fmv_aspect_ratio_switch_labels), fmv_aspect_ratio_switch_labels, wxCB_READONLY); - - m_combo_vsync = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - std::size(vsync_label), vsync_label, wxCB_READONLY); - - m_text_WindowWidth = CreateNumericalTextCtrl(this, 5); - m_text_WindowHeight = CreateNumericalTextCtrl(this, 5); - - // Linux/Mac note: Exclusive Fullscreen mode is probably Microsoft specific, though - // I'm not yet 100% certain of that. - - m_check_SizeLock = new pxCheckBox(this, _("Disable window resize border")); - m_check_HideMouse = new pxCheckBox(this, _("Always hide mouse cursor")); - m_check_CloseGS = new pxCheckBox(this, _("Hide window when paused")); - // Implement custom hotkeys (Alt + Enter) with translatable string intact + not blank in GUI. - m_check_Fullscreen = new pxCheckBox(this, _("Start in fullscreen mode by default") + wxString(" (") + wxGetApp().GlobalAccels->findKeycodeWithCommandId("FullscreenToggle").toTitleizedString() + wxString(")")); - m_check_DclickFullscreen = new pxCheckBox(this, _("Double-click toggles fullscreen mode")); - - m_combo_FMVAspectRatioSwitch->SetToolTip(pxEt(L"Off: Disables temporary aspect ratio switch. (It will use the above setting from Aspect Ratio instead of FMV Aspect Ratio Override.)\n\n" - L"Auto 4:3/3:2: Temporarily switch to a 4:3 aspect ratio while an FMV plays to correctly display a 4:3 FMV. Will use 3:2 is the resolution is 480P\n\n" - L"4:3: Temporarily switch to a 4:3 aspect ratio while an FMV plays to correctly display a 4:3 FMV. \n\n" - L"16:9: Temporarily switch to a 16:9 aspect ratio while an FMV plays to correctly display a widescreen 16:9 FMV.")); - - m_combo_vsync->SetToolTip(pxEt(L"Vsync eliminates screen tearing but typically has a big performance hit. It usually only applies to fullscreen mode.")); - - m_check_HideMouse->SetToolTip(pxEt(L"Check this to force the mouse cursor invisible inside the GS window; useful if using the mouse as a primary control device for gaming. By default the mouse auto-hides after 2 seconds of inactivity.")); - - m_check_Fullscreen->SetToolTip(pxEt(L"Enables automatic mode switch to fullscreen when starting or resuming emulation. You can still toggle fullscreen display at any time using \n" - L"Alt-Enter or double clicking the output window (game).")); - - m_check_CloseGS->SetToolTip(pxEt(L"Completely closes the often large and bulky GS window when pressing ESC or pausing the emulator.")); - - // ---------------------------------------------------------------------------- - // Layout and Positioning - - wxBoxSizer& s_customsize(*new wxBoxSizer(wxHORIZONTAL)); - s_customsize += m_text_WindowWidth; - s_customsize += Label(L"x") | StdExpand(); - s_customsize += m_text_WindowHeight; - - wxFlexGridSizer& s_AspectRatio(*new wxFlexGridSizer(2, StdPadding, StdPadding)); - //s_AspectRatio.AddGrowableCol( 0 ); - s_AspectRatio.AddGrowableCol(1); - - // Implement custom hotkeys (F6) with translatable string intact + not blank in GUI. - s_AspectRatio += Label(_("Aspect Ratio:") + wxString::Format(" (%s)", wxGetApp().GlobalAccels->findKeycodeWithCommandId("GSwindow_CycleAspectRatio").toTitleizedString())); - s_AspectRatio += m_combo_AspectRatio | pxAlignRight; - s_AspectRatio += Label(_("FMV Aspect Ratio Override:")) | pxMiddle; - s_AspectRatio += m_combo_FMVAspectRatioSwitch | pxAlignRight; - s_AspectRatio += Label(_("Custom Window Size:")) | pxMiddle; - s_AspectRatio += s_customsize | pxAlignRight; - - wxFlexGridSizer& s_vsync(*new wxFlexGridSizer(2, StdPadding, StdPadding)); - s_vsync.AddGrowableCol(1); - - s_vsync += Label(_("Wait for Vsync on refresh:")) | pxMiddle; - s_vsync += m_combo_vsync | pxAlignRight; - - *this += s_AspectRatio | StdExpand(); - *this += new wxStaticLine(this) | StdExpand(); - - *this += m_check_SizeLock; - *this += m_check_HideMouse; - *this += m_check_CloseGS; - *this += new wxStaticLine(this) | StdExpand(); - - *this += m_check_Fullscreen; - *this += m_check_DclickFullscreen; - *this += new wxStaticLine(this) | StdExpand(); - - *this += s_vsync | StdExpand(); - - wxBoxSizer* centerSizer = new wxBoxSizer(wxVERTICAL); - *centerSizer += GetSizer() | pxCenter; - SetSizer(centerSizer, false); - - AppStatusEvent_OnSettingsApplied(); -} - -void Panels::GSWindowSettingsPanel::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui(*g_Conf); -} - -void Panels::GSWindowSettingsPanel::ApplyConfigToGui(AppConfig& configToApply, int flags) -{ - const Pcsx2Config::GSOptions& gsconf(configToApply.EmuOptions.GS); - const AppConfig::GSWindowOptions& conf(configToApply.GSWindow); - - if (!(flags & AppConfig::APPLY_FLAG_FROM_PRESET)) - { //Presets don't control these values - m_check_CloseGS->SetValue(conf.CloseOnEsc); - m_check_Fullscreen->SetValue(conf.DefaultToFullscreen); - m_check_HideMouse->SetValue(conf.AlwaysHideMouse); - m_check_SizeLock->SetValue(conf.DisableResizeBorders); - - m_combo_AspectRatio->SetSelection((int)gsconf.AspectRatio); - m_combo_FMVAspectRatioSwitch->SetSelection(enum_cast(gsconf.FMVAspectRatioSwitch)); - - m_check_DclickFullscreen->SetValue(conf.IsToggleFullscreenOnDoubleClick); - - m_text_WindowWidth->ChangeValue(wxsFormat(L"%d", conf.WindowSize.GetWidth())); - m_text_WindowHeight->ChangeValue(wxsFormat(L"%d", conf.WindowSize.GetHeight())); - } - - m_combo_vsync->SetSelection(enum_cast(configToApply.EmuOptions.GS.VsyncEnable)); - m_combo_vsync->Enable(true); // Always allow, regardless of preset -} - -void Panels::GSWindowSettingsPanel::Apply() -{ - AppConfig::GSWindowOptions& appconf(g_Conf->GSWindow); - Pcsx2Config::GSOptions& gsconf(g_Conf->EmuOptions.GS); - - appconf.CloseOnEsc = m_check_CloseGS->GetValue(); - appconf.DefaultToFullscreen = m_check_Fullscreen->GetValue(); - appconf.AlwaysHideMouse = m_check_HideMouse->GetValue(); - appconf.DisableResizeBorders = m_check_SizeLock->GetValue(); - - gsconf.AspectRatio = (AspectRatioType)m_combo_AspectRatio->GetSelection(); - gsconf.FMVAspectRatioSwitch = (FMVAspectRatioSwitchType)m_combo_FMVAspectRatioSwitch->GetSelection(); - EmuConfig.CurrentAspectRatio = gsconf.AspectRatio; - - gsconf.VsyncEnable = static_cast(m_combo_vsync->GetSelection()); - - appconf.IsToggleFullscreenOnDoubleClick = m_check_DclickFullscreen->GetValue(); - - long xr, yr = 1; - - if (!m_text_WindowWidth->GetValue().ToLong(&xr) || !m_text_WindowHeight->GetValue().ToLong(&yr)) - throw Exception::CannotApplySettings(this) - .SetDiagMsg("User submitted non-numeric window size parameters!") - .SetUserMsg("Invalid window dimensions specified: Size cannot contain non-numeric digits! >_<"); - - appconf.WindowSize.x = xr; - appconf.WindowSize.y = yr; -} diff --git a/pcsx2/gui/Panels/GameFixesPanel.cpp b/pcsx2/gui/Panels/GameFixesPanel.cpp deleted file mode 100644 index 3d8c302a54..0000000000 --- a/pcsx2/gui/Panels/GameFixesPanel.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "ConfigurationPanels.h" - -using namespace pxSizerFlags; - -Panels::GameFixesPanel::GameFixesPanel( wxWindow* parent ) - : BaseApplicableConfigPanel_SpecificConfig( parent ) -{ - wxStaticBoxSizer& groupSizer = *new wxStaticBoxSizer( wxVERTICAL, this, _("Gamefixes") ); - - // NOTE: Order of checkboxes must match the order of the bits in the GamefixOptions structure! - // NOTE2: Don't make this static, because translations can change at run-time :) - // NOTE3: This panel is way to big, header text was reduced as a temporary solution. - // However if you want add more gamefix, a final solution must be found (noteboox/scrolling...) - - struct CheckTextMess - { - wxString label, tooltip; - }; - - const CheckTextMess check_text[GamefixId_COUNT] = - { - { - _("FPU Multiply Hack - For Tales of Destiny."), - wxEmptyString - }, - { - _("FPU Negative Div Hack - For Gundam games."), - wxEmptyString - }, - { - _("Preload TLB hack to avoid tlb miss on Goemon"), - wxEmptyString - }, - { - _("Switch to Software renderer for FMVs"), - wxEmptyString - }, - { - _("Skip MPEG hack - Skips videos/FMVs in games to avoid game hanging/freezes."), - wxEmptyString - }, - { - _("OPH Flag hack - Try if your game freezes showing the same frame."), - pxEt( L"Known to affect following games:\n * Bleach Blade Battler\n * Growlanser II and III\n * Wizardry" - ) - }, - { - _("EE timing hack - Multi purpose hack. Try if all else fails."), - pxEt(L"Known to affect following games:\n * Digital Devil Saga (Fixes FMV and crashes)\n * SSX (Fixes bad graphics and crashes)\n * Resident Evil: Dead Aim (Causes garbled textures)" - ) - }, - { - _("Instant DMA hack. Try if all else fails."), - pxEt(L"Known to affect following games:\n * Fire Pro Wrestling Z (Bad ring graphics)" - ) - }, - { - _("Handle DMAC writes when it is busy."), - pxEt( L"Known to affect following games:\n * Mana Khemia 1 (Going \"off campus\"), Metal Saga (Intro FMV), Pilot Down Behind Enemy Lines\n" - ) - }, - { - _("Force GIF PATH3 transfers through FIFO (Fifa Street 2)"), - wxEmptyString - }, - { - _("Simulate VIF1 FIFO read ahead. Fixes slow loading games."), - pxEt( L"Known to affect following games:\n * Test Drive Unlimited\n * Transformers" - ) - }, - { - _("Delay VIF1 Stalls (VIF1 FIFO) - For SOCOM 2 HUD and Spy Hunter loading hang."), - wxEmptyString - }, - { - _("VU Add Hack - Fixes Tri-Ace games boot crash."), - _("Games that need this hack to boot:\n * Star Ocean 3\n * Radiata Stories\n * Valkyrie Profile 2") - }, - { - _("VU I bit Hack avoid constant recompilation in some games (Scarface The World Is Yours, Crash Tag Team Racing)"), - wxEmptyString - }, - { - _("VU Sync (Run behind) to avoid sync problems when reading or writing VU registers"), - wxEmptyString - }, - { - _("VU Overflow hack to check for possible float overflows (Superman Returns)"), - wxEmptyString - }, - { - _("VU XGkick Sync - Use accurate timing for VU XGKicks (Slower)"), - pxEt(L"Fixes graphical errors on WRC, Erementar Gerad, Tennis Court Smash and others." - ) - }, - { - _("Use Blit for internal FPS"), - pxEt(L"Use alternative method to calclate internal FPS to avoid false readings in some games." - ) - } - }; - - for( int i=0; iSetToolTip( check_text[i].tooltip ); - } - - m_check_Enable = new pxCheckBox( this, _("Enable manual game fixes [Not recommended]"), - pxE( L"It's better to enable 'Automatic game fixes' at the main menu instead, and leave this page empty ('Automatic' means: selectively use specific tested fixes for specific games). Manual game fixes will NOT increase your performance. In fact they may decrease it." - ) - ); - - m_check_Enable->SetToolTip(pxE(L"Gamefixes can work around wrong emulation in some titles. \nThey may also cause compatibility or performance issues.\n\nThe safest way is to make sure that all game fixes are completely disabled.")).SetSubPadding( 1 ); - m_check_Enable->SetValue( g_Conf->EnableGameFixes ); - - *this += m_check_Enable | StdExpand(); - *this += groupSizer | pxCenter; - - Bind(wxEVT_CHECKBOX, &GameFixesPanel::OnEnable_Toggled, this, m_check_Enable->GetId()); - - EnableStuff(); -} - -void Panels::GameFixesPanel::Apply() -{ - g_Conf->EnableGameFixes = m_check_Enable->GetValue(); - - Pcsx2Config::GamefixOptions& opts( g_Conf->EmuOptions.Gamefixes ); - for (GamefixId i=GamefixId_FIRST; i < pxEnumEnd; ++i) - opts.Set((GamefixId)i, m_checkbox[i]->GetValue()); - - // make sure the user's command line specifications are disabled (if present). - wxGetApp().Overrides.ApplyCustomGamefixes = false; -} - -void Panels::GameFixesPanel::EnableStuff( AppConfig* configToUse ) -{ - if (!configToUse) configToUse = g_Conf.get(); - for (GamefixId i=GamefixId_FIRST; i < pxEnumEnd; ++i) - m_checkbox[i]->Enable(m_check_Enable->GetValue() && !configToUse->EnablePresets); - - Layout(); -} - -void Panels::GameFixesPanel::OnEnable_Toggled( wxCommandEvent& evt ) -{ - AppConfig tmp=*g_Conf; - tmp.EnablePresets=false; //if clicked, button was enabled, so not using a preset --> let EnableStuff work - - EnableStuff( &tmp ); - evt.Skip(); -} - -void Panels::GameFixesPanel::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui( *g_Conf ); -} - -void Panels::GameFixesPanel::ApplyConfigToGui( AppConfig& configToApply, int flags ) -{ - const Pcsx2Config::GamefixOptions& opts( configToApply.EmuOptions.Gamefixes ); - for (GamefixId i=GamefixId_FIRST; i < pxEnumEnd; ++i) - m_checkbox[i]->SetValue( opts.Get((GamefixId)i) );//apply the use/don't-use fix values - - m_check_Enable->SetValue( configToApply.EnableGameFixes );//main gamefixes checkbox - EnableStuff( &configToApply );// enable/disable the all the fixes controls according to the main one - - this->Enable(!configToApply.EnablePresets); -} diff --git a/pcsx2/gui/Panels/LogOptionsPanels.cpp b/pcsx2/gui/Panels/LogOptionsPanels.cpp deleted file mode 100644 index f5d7330ece..0000000000 --- a/pcsx2/gui/Panels/LogOptionsPanels.cpp +++ /dev/null @@ -1,347 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "LogOptionsPanels.h" - -#include "gui/IniInterface.h" -#include "DebugTools/Debug.h" - -#include "common/StringUtil.h" - -#include - - -using namespace pxSizerFlags; - -Panels::eeLogOptionsPanel::eeLogOptionsPanel( LogOptionsPanel* parent ) - : BaseCpuLogOptionsPanel( parent, L"EE Logs" ) -{ - SetMinWidth( 300 ); - - m_miscGroup = new wxStaticBoxSizer( wxVERTICAL, this, L"General" ); - - m_disasmPanel = new CheckedStaticBox( this, wxVERTICAL, L"Disasm" ); - m_hwPanel = new CheckedStaticBox( this, wxVERTICAL, L"Registers" ); - m_evtPanel = new CheckedStaticBox( this, wxVERTICAL, L"Events" ); - - wxFlexGridSizer& eeTable( *new wxFlexGridSizer( 2, 5, 0 ) ); - - eeTable.AddGrowableCol(0); - eeTable.AddGrowableCol(1); - - eeTable += m_miscGroup | SubGroup(); - eeTable += m_hwPanel | SubGroup(); - eeTable += m_evtPanel | SubGroup(); - eeTable += m_disasmPanel | SubGroup(); - - ThisSizer += 4; - ThisSizer += eeTable | pxExpand; - - SetValue( true ); -} - -Panels::iopLogOptionsPanel::iopLogOptionsPanel( LogOptionsPanel* parent ) - : BaseCpuLogOptionsPanel( parent, L"IOP Logs" ) -{ - SetMinWidth( 280 ); - - m_miscGroup = new wxStaticBoxSizer( wxVERTICAL, this, L"General" ); - - m_disasmPanel = new CheckedStaticBox( this, wxVERTICAL, L"Disasm" ); - m_hwPanel = new CheckedStaticBox( this, wxVERTICAL, L"Registers" ); - m_evtPanel = new CheckedStaticBox( this, wxVERTICAL, L"Events" ); - - wxFlexGridSizer& iopTable( *new wxFlexGridSizer( 2, 5, 0 ) ); - - iopTable.AddGrowableCol(0); - iopTable.AddGrowableCol(1); - - iopTable += m_miscGroup | SubGroup(); - iopTable += m_hwPanel | SubGroup(); - iopTable += m_evtPanel | SubGroup(); - iopTable += m_disasmPanel | SubGroup(); - - ThisSizer += 4; - ThisSizer += iopTable | pxExpand; - - SetValue( true ); -} - -CheckedStaticBox* Panels::eeLogOptionsPanel::GetStaticBox( const wxString& subgroup ) const -{ - if (0 == subgroup.CmpNoCase( L"Disasm" )) return m_disasmPanel; - if (0 == subgroup.CmpNoCase( L"Registers" )) return m_hwPanel; - if (0 == subgroup.CmpNoCase( L"Events" )) return m_evtPanel; - - return NULL; -} - -CheckedStaticBox* Panels::iopLogOptionsPanel::GetStaticBox( const wxString& subgroup ) const -{ - if (0 == subgroup.CmpNoCase( L"Disasm" )) return m_disasmPanel; - if (0 == subgroup.CmpNoCase( L"Registers" )) return m_hwPanel; - if (0 == subgroup.CmpNoCase( L"Events" )) return m_evtPanel; - - return NULL; -} - - -void Panels::eeLogOptionsPanel::OnSettingsChanged() -{ - const TraceLogFilters& conf( g_Conf->EmuOptions.Trace ); - - SetValue( conf.EE.m_EnableAll ); - - m_disasmPanel ->SetValue( conf.EE.m_EnableDisasm ); - m_evtPanel ->SetValue( conf.EE.m_EnableEvents ); - m_hwPanel ->SetValue( conf.EE.m_EnableRegisters ); -} - -void Panels::iopLogOptionsPanel::OnSettingsChanged() -{ - const TraceLogFilters& conf( g_Conf->EmuOptions.Trace ); - - SetValue( conf.IOP.m_EnableAll ); - - m_disasmPanel ->SetValue( conf.IOP.m_EnableDisasm ); - m_evtPanel ->SetValue( conf.IOP.m_EnableEvents ); - m_hwPanel ->SetValue( conf.IOP.m_EnableRegisters ); -} - -static SysTraceLog * const traceLogList[] = -{ - &SysTrace.SIF, - - &SysTrace.EE.Bios, - &SysTrace.EE.Memory, - - &SysTrace.EE.R5900, - &SysTrace.EE.COP0, - &SysTrace.EE.COP1, - &SysTrace.EE.COP2, - &SysTrace.EE.Cache, - - &SysTrace.EE.KnownHw, - &SysTrace.EE.UnknownHw, - &SysTrace.EE.DMAhw, - &SysTrace.EE.IPU, - &SysTrace.EE.GIFtag, - &SysTrace.EE.VIFcode, - &SysTrace.EE.MSKPATH3, - - &SysTrace.EE.DMAC, - &SysTrace.EE.Counters, - &SysTrace.EE.SPR, - &SysTrace.EE.VIF, - &SysTrace.EE.GIF, - - - // IOP Section - - &SysTrace.IOP.Bios, - &SysTrace.IOP.Memcards, - &SysTrace.IOP.PAD, - - &SysTrace.IOP.R3000A, - &SysTrace.IOP.COP2, - &SysTrace.IOP.Memory, - - &SysTrace.IOP.KnownHw, - &SysTrace.IOP.UnknownHw, - &SysTrace.IOP.DMAhw, - &SysTrace.IOP.DMAC, - &SysTrace.IOP.Counters, - &SysTrace.IOP.CDVD, - &SysTrace.IOP.MDEC, -}; - -static const uint traceLogCount = std::size(traceLogList); - -void SysTraceLog_LoadSaveSettings( IniInterface& ini ) -{ - ScopedIniGroup path(ini, L"TraceLogSources"); - - for (uint i=0; iGetName(), "Trace log without a name!" ); - ini.Entry( StringUtil::UTF8StringToWxString(log->GetCategory() + "." + log->GetShortName()), log->Enabled, false ); - } - } -} - -static bool traceLogEnabled( const wxString& ident ) -{ - // Brute force search for now. not enough different source logs to - // justify using a hash table, and switching over to a "complex" class - // type from the current simple array initializer requires effort to - // avoid C++ global initializer dependency hell. - - for( uint i=0; iGetCategory())) ) - return traceLogList[i]->Enabled; - } - - pxFailDev( wxsFormat(L"Invalid or unknown TraceLog identifier: %s", ident.c_str()).ToUTF8() ); - return false; -} - -// -------------------------------------------------------------------------------------- -// LogOptionsPanel Implementations -// -------------------------------------------------------------------------------------- -Panels::LogOptionsPanel::LogOptionsPanel(wxWindow* parent ) - : BaseApplicableConfigPanel( parent ) - , m_checks( new pxCheckBox*[traceLogCount] ) -{ - m_miscSection = new wxStaticBoxSizer( wxHORIZONTAL, this, L"Misc" ); - - m_eeSection = new eeLogOptionsPanel( this ); - m_iopSection = new iopLogOptionsPanel( this ); - - for( uint i = 0; iGetStaticBox(group)) - { - addsizer = &cpugroup->ThisSizer; - addparent = cpugroup; - } - else - { - addsizer = cpupanel->GetMiscGroup(); - addparent = cpupanel; - } - } - else - { - addsizer = m_miscSection; - addparent = m_miscSection->GetStaticBox(); - } - - *addsizer += m_checks[i] = new pxCheckBox( addparent, item.GetName() ); - if( m_checks[i] && item.HasDescription() ) - m_checks[i]->SetToolTip(item.GetDescription()); - } - - m_masterEnabler = new pxCheckBox( this, _("Enable Trace Logging"), - _("Trace logs are all written to emulog.txt. Toggle trace logging at any time using F10.") ); - m_masterEnabler->SetToolTip( _("Warning: Trace logging is typically very slow, and is a leading cause of 'What happened to my FPS?' problems. :)") ); - - wxFlexGridSizer& topSizer = *new wxFlexGridSizer( 2 ); - - topSizer.AddGrowableCol(0); - topSizer.AddGrowableCol(1); - - topSizer += m_eeSection | StdExpand(); - topSizer += m_iopSection | StdExpand(); - - *this += m_masterEnabler | StdExpand(); - *this += new wxStaticLine( this ) | StdExpand().Border(wxLEFT | wxRIGHT, 20); - *this += 5; - *this += topSizer | StdExpand(); - *this += m_miscSection | StdSpace().Centre(); - - Bind(wxEVT_CHECKBOX, &LogOptionsPanel::OnCheckBoxClicked, this, m_masterEnabler->GetWxPtr()->GetId()); -} - -Panels::BaseCpuLogOptionsPanel* Panels::LogOptionsPanel::GetCpuPanel( const wxString& token ) const -{ - if( token == L"EE" ) return m_eeSection; - if( token == L"IOP" ) return m_iopSection; - - return NULL; -} - -void Panels::LogOptionsPanel::AppStatusEvent_OnSettingsApplied() -{ - TraceLogFilters& conf( g_Conf->EmuOptions.Trace ); - - m_masterEnabler->SetValue( conf.Enabled ); - - m_eeSection->OnSettingsChanged(); - m_iopSection->OnSettingsChanged(); - - for (uint i=0; iSetValue(traceLogList[i]->Enabled); - } - OnUpdateEnableAll(); -} - -void Panels::LogOptionsPanel::OnUpdateEnableAll() -{ - bool enabled( m_masterEnabler->GetValue() ); - - m_eeSection->Enable( enabled ); - m_iopSection->Enable( enabled ); - m_miscSection->GetStaticBox()->Enable( enabled ); -} - -void Panels::LogOptionsPanel::OnCheckBoxClicked(wxCommandEvent &evt) -{ - OnUpdateEnableAll(); - evt.Skip(); -} - -void Panels::LogOptionsPanel::Apply() -{ - g_Conf->EmuOptions.Trace.Enabled = m_masterEnabler->GetValue(); - - m_eeSection->Apply(); - m_iopSection->Apply(); - - for( uint i = 0; iEnabled = m_checks[i]->IsChecked(); - } -} - -#define GetSet( cpu, name ) SysTrace.cpu.name.Enabled = m_##name->GetValue() - -void Panels::eeLogOptionsPanel::Apply() -{ - TraceFiltersEE& conf( g_Conf->EmuOptions.Trace.EE ); - - conf.m_EnableAll = GetValue(); - conf.m_EnableDisasm = m_disasmPanel->GetValue(); - conf.m_EnableRegisters = m_hwPanel->GetValue(); - conf.m_EnableEvents = m_evtPanel->GetValue(); -} - -void Panels::iopLogOptionsPanel::Apply() -{ - TraceFiltersIOP& conf( g_Conf->EmuOptions.Trace.IOP ); - - conf.m_EnableAll = GetValue(); - conf.m_EnableDisasm = m_disasmPanel->GetValue(); - conf.m_EnableRegisters = m_hwPanel->GetValue(); - conf.m_EnableEvents = m_evtPanel->GetValue(); -} diff --git a/pcsx2/gui/Panels/LogOptionsPanels.h b/pcsx2/gui/Panels/LogOptionsPanels.h deleted file mode 100644 index c67ba88597..0000000000 --- a/pcsx2/gui/Panels/LogOptionsPanels.h +++ /dev/null @@ -1,97 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "gui/AppCommon.h" -#include "gui/ApplyState.h" -#include - -namespace Panels -{ - class LogOptionsPanel; - - class BaseCpuLogOptionsPanel : public CheckedStaticBox - { - protected: - wxStaticBoxSizer* m_miscGroup; - - public: - BaseCpuLogOptionsPanel(wxWindow* parent, const wxString& title, wxOrientation orient = wxVERTICAL) - : CheckedStaticBox(parent, orient, title), m_miscGroup(NULL){} - - virtual wxStaticBoxSizer* GetMiscGroup() const { return m_miscGroup; } - virtual CheckedStaticBox* GetStaticBox( const wxString& subgroup ) const=0; - }; - - class eeLogOptionsPanel : public BaseCpuLogOptionsPanel - { - protected: - CheckedStaticBox* m_disasmPanel; - CheckedStaticBox* m_hwPanel; - CheckedStaticBox* m_evtPanel; - - public: - eeLogOptionsPanel( LogOptionsPanel* parent ); - virtual ~eeLogOptionsPanel() = default; - - CheckedStaticBox* GetStaticBox( const wxString& subgroup ) const; - - void OnSettingsChanged(); - void Apply(); - }; - - - class iopLogOptionsPanel : public BaseCpuLogOptionsPanel - { - protected: - CheckedStaticBox* m_disasmPanel; - CheckedStaticBox* m_hwPanel; - CheckedStaticBox* m_evtPanel; - - public: - iopLogOptionsPanel( LogOptionsPanel* parent ); - virtual ~iopLogOptionsPanel() = default; - - CheckedStaticBox* GetStaticBox( const wxString& subgroup ) const; - - void OnSettingsChanged(); - void Apply(); - }; - - class LogOptionsPanel : public BaseApplicableConfigPanel - { - protected: - eeLogOptionsPanel* m_eeSection; - iopLogOptionsPanel* m_iopSection; - wxStaticBoxSizer* m_miscSection; - - pxCheckBox* m_masterEnabler; - - std::unique_ptr m_checks; - - public: - LogOptionsPanel( wxWindow* parent ); - virtual ~LogOptionsPanel() = default; - - void AppStatusEvent_OnSettingsApplied(); - void OnUpdateEnableAll(); - void OnCheckBoxClicked(wxCommandEvent &event); - void Apply(); - - protected: - BaseCpuLogOptionsPanel* GetCpuPanel( const wxString& token ) const; - }; -} diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp deleted file mode 100644 index d7063b7f22..0000000000 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ /dev/null @@ -1,1314 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2018 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/AppCoreThread.h" -#include "System.h" -#include "MemoryCardFile.h" - -#include "ConfigurationPanels.h" -#include "MemoryCardPanels.h" - -#include "gui/Dialogs/ConfigurationDialog.h" -#include "gui/IniInterface.h" -#include "common/StringUtil.h" -#include "Sio.h" - -#include -#include -#include - - -static wxDataFormat drag_drop_format(L"PCSX2McdDragDrop"); - -bool CopyDirectory(const wxString& from, const wxString& to); -bool RemoveWxDirectory(const wxString& dirname); - -using namespace pxSizerFlags; -using namespace Panels; - -static bool IsMcdFormatted(wxFFile& fhand) -{ - static const char formatted_psx[] = "MC"; - static const char formatted_string[] = "Sony PS2 Memory Card Format"; - static const int fmtstrlen = sizeof(formatted_string) - 1; - - char dest[fmtstrlen]; - - fhand.Read(dest, fmtstrlen); - - bool formatted = memcmp(formatted_string, dest, fmtstrlen) == 0; - if (!formatted) - formatted = memcmp(formatted_psx, dest, 2) == 0; - - return formatted; -} - -//sets IsPresent if the file is valid, and derived properties (filename, formatted, size, etc) -bool EnumerateMemoryCard(McdSlotItem& dest, const wxFileName& filename, const wxDirName basePath) -{ - dest.IsFormatted = false; - dest.IsPresent = false; - dest.IsPSX = false; - dest.Type = MemoryCardType::Empty; - - const wxString fullpath(filename.GetFullPath()); - //DevCon.WriteLn( fullpath ); - if (filename.FileExists()) - { - // might be a memory card file - wxFFile mcdFile(fullpath); - if (!mcdFile.IsOpened()) - { - return false; - } // wx should log the error for us. - - wxFileOffset length = mcdFile.Length(); - - if (length < (1024 * 528) && length != 0x20000) - { - Console.Warning("... Memory card appears to be truncated. Ignoring."); - return false; - } - - const int mb_ecc = 1024 * 528 * 2; - const int mb_noecc = 1024 * 512 * 2; - dest.SizeInMB = (uint)(length % mb_ecc ? length / mb_noecc : length / mb_ecc); - - if (length == 0x20000) - { - dest.IsPSX = true; // PSX memcard; - dest.SizeInMB = 1; // MegaBIT - } - - dest.Type = MemoryCardType::File; - dest.IsFormatted = IsMcdFormatted(mcdFile); - filename.GetTimes(NULL, &dest.DateModified, &dest.DateCreated); - } - else if (filename.DirExists()) - { - // might be a memory card folder - wxFileName superBlockFileName(fullpath, L"_pcsx2_superblock"); - if (!superBlockFileName.FileExists()) - { - return false; - } - wxFFile mcdFile(superBlockFileName.GetFullPath()); - if (!mcdFile.IsOpened()) - { - return false; - } - - dest.SizeInMB = 0; - - dest.Type = MemoryCardType::Folder; - dest.IsFormatted = IsMcdFormatted(mcdFile); - superBlockFileName.GetTimes(NULL, &dest.DateModified, &dest.DateCreated); - } - else - { - // is neither - return false; - } - - dest.IsPresent = true; - dest.Filename = filename; - if (filename.GetFullPath() == (basePath + filename.GetFullName()).GetFullPath()) - dest.Filename = filename.GetFullName(); - - return true; -} - -//avih: unused -/* -static int EnumerateMemoryCards( McdList& dest, const wxArrayString& files ) -{ - int pushed = 0; - Console.WriteLn( Color_StrongBlue, "Enumerating memory cards..." ); - for( size_t i=0; i 0 ) - Console.WriteLn( Color_StrongBlue, "Memory card Enumeration Complete." ); - else - Console.WriteLn( Color_StrongBlue, "No valid memory card found." ); - - return pushed; -} -*/ -// -------------------------------------------------------------------------------------- -// McdListItem (implementations) -// -------------------------------------------------------------------------------------- -bool McdSlotItem::IsMultitapSlot() const -{ - return FileMcd_IsMultitapSlot(Slot); -} - -uint McdSlotItem::GetMtapPort() const -{ - return FileMcd_GetMtapPort(Slot); -} - -uint McdSlotItem::GetMtapSlot() const -{ - return FileMcd_GetMtapSlot(Slot); -} - -// Compares two cards -- If this equality comparison is used on items where -// no filename is specified, then the check will include port and slot. -bool McdSlotItem::operator==(const McdSlotItem& right) const -{ - bool fileEqu; - - if (Filename.GetFullName().IsEmpty()) - fileEqu = OpEqu(Slot); - else - fileEqu = OpEqu(Filename); - - return fileEqu && - OpEqu(IsPresent) && OpEqu(IsEnabled) && - OpEqu(SizeInMB) && OpEqu(IsFormatted) && - OpEqu(DateCreated) && OpEqu(DateModified); -} - -bool McdSlotItem::operator!=(const McdSlotItem& right) const -{ - return operator==(right); -} - - -// ===================================================================================================== -// BaseMcdListPanel (implementations) -// ===================================================================================================== -Panels::BaseMcdListPanel::BaseMcdListPanel(wxWindow* parent) - : _parent(parent) -{ - m_FolderPicker = new DirPickerPanel(this, FolderId_MemoryCards, - //_("memory card Search Path:"), // static box label - _("Select folder with PS2 memory cards") // dir picker popup label - ); - - m_listview = NULL; - s_leftside_buttons = NULL; - s_rightside_buttons = NULL; - - m_btn_Refresh = new wxButton(this, wxID_ANY, _("Refresh list")); - - Bind(wxEVT_BUTTON, &BaseMcdListPanel::OnRefreshSelections, this, m_btn_Refresh->GetId()); -} - -void Panels::BaseMcdListPanel::RefreshMcds() const -{ - wxCommandEvent refit(wxEVT_BUTTON); - refit.SetId(m_btn_Refresh->GetId()); - GetEventHandler()->AddPendingEvent(refit); -} - -void Panels::BaseMcdListPanel::CreateLayout() -{ - //if( m_listview ) m_listview->SetMinSize( wxSize( 480, 140 ) ); - - wxFlexGridSizer* s_flex = new wxFlexGridSizer(3, 1, 0, 0); - s_flex->AddGrowableCol(0); - s_flex->AddGrowableRow(1); - SetSizer(s_flex); - - wxBoxSizer& s_buttons(*new wxBoxSizer(wxHORIZONTAL)); - s_leftside_buttons = new wxBoxSizer(wxHORIZONTAL); - s_rightside_buttons = new wxBoxSizer(wxHORIZONTAL); - - s_buttons += s_leftside_buttons | pxAlignLeft; - s_buttons += pxStretchSpacer(); - s_buttons += s_rightside_buttons | pxAlignRight; - - if (m_FolderPicker) - *this += m_FolderPicker | pxExpand; - else - *this += StdPadding; //we need the 'else' because we need these items to land into the proper rows of s_flex. - - if (m_listview) - *this += m_listview | pxExpand; - else - *this += StdPadding; - - *this += s_buttons | pxExpand; - - *s_leftside_buttons += m_btn_Refresh; - - if (m_listview) - { - IniLoader loader; - ScopedIniGroup group(loader, L"MemoryCardListPanel"); - m_listview->LoadSaveColumns(loader); - } -} - -void Panels::BaseMcdListPanel::Apply() -{ - // Save column widths to the configuration file. Since these are used *only* by this - // dialog, we use a direct local ini save approach, instead of going through g_conf. - if (m_listview) - { - IniSaver saver; - ScopedIniGroup group(saver, L"MemoryCardListPanel"); - m_listview->LoadSaveColumns(saver); - } -} - -void Panels::BaseMcdListPanel::AppStatusEvent_OnSettingsApplied() -{ - if ((m_MultitapEnabled[0] != g_Conf->EmuOptions.MultitapPort0_Enabled) || - (m_MultitapEnabled[1] != g_Conf->EmuOptions.MultitapPort1_Enabled)) - { - m_MultitapEnabled[0] = g_Conf->EmuOptions.MultitapPort0_Enabled; - m_MultitapEnabled[1] = g_Conf->EmuOptions.MultitapPort1_Enabled; - - RefreshMcds(); - } -} - -class McdDropTarget : public wxDropTarget -{ -protected: - BaseMcdListView* m_listview; - -public: - McdDropTarget(BaseMcdListView* listview = NULL) - { - m_listview = listview; - SetDataObject(new wxCustomDataObject(drag_drop_format)); - } - - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) - { - int flags = 0; - - int destViewIndex = m_listview->HitTest(wxPoint(x, y), flags); - if (wxNOT_FOUND == destViewIndex) - destViewIndex = -1; //non list item target is the filesystem placeholder. - - if (!GetData()) - return wxDragNone; - - wxCustomDataObject* dobj = static_cast(GetDataObject()); - - if (dobj->GetDataSize() != sizeof(int)) - return wxDragNone; - - int sourceViewIndex; - dobj->GetDataHere(&sourceViewIndex); - - wxDragResult result = OnDropMcd( - m_listview->GetMcdProvider().GetCardForViewIndex(sourceViewIndex), - m_listview->GetMcdProvider().GetCardForViewIndex(destViewIndex), - def); - - if (wxDragNone == result) - return wxDragNone; - - m_listview->GetMcdProvider().RefreshMcds(); - return result; - } - - - virtual wxDragResult OnDropMcd(McdSlotItem& src, McdSlotItem& dest, wxDragResult def) - { - if (src.Slot == dest.Slot) - return wxDragNone; - //if( !pxAssert( (src.Slot >= 0) && (dest.Slot >= 0) ) ) return wxDragNone; - const wxDirName basepath(m_listview->GetMcdProvider().GetMcdPath()); - - if (wxDragCopy == def) - { - if (!m_listview->GetMcdProvider().UiDuplicateCard(src, dest)) - return wxDragNone; - } - else if (wxDragMove == def) - { // source can only be an existing card. - // if dest is a ps2-port (empty or not) -> swap cards between ports. - // is dest is a non-ps2-port -> remove card from port. - - // Note: For the sake of usability, automatically enable dest if a ps2-port. - if (src.IsPresent) - { - wxFileName tmpFilename = dest.Filename; - bool tmpPresent = dest.IsPresent; - if (src.Slot < 0 && m_listview->GetMcdProvider().isFileAssignedToInternalSlot(src.Filename)) - m_listview->GetMcdProvider().RemoveCardFromSlot(src.Filename); - - dest.Filename = src.Filename; - dest.IsEnabled = dest.IsPresent ? dest.IsEnabled : true; - dest.IsPresent = src.IsPresent; - - if (dest.Slot >= 0) - { //2 internal slots: swap - src.Filename = tmpFilename; - src.IsPresent = tmpPresent; - } - else - { //dest is at the filesystem (= remove card from slot) - src.Filename = L""; - src.IsPresent = false; - src.IsEnabled = false; - } - } - } - - return def; - } -}; - - -enum McdMenuId -{ - McdMenuId_Create = 0x888, - //McdMenuId_Mount, - McdMenuId_Rename, - McdMenuId_RefreshList, - McdMenuId_AssignUnassign, - McdMenuId_Duplicate, - McdMenuId_Convert, -}; - - -Panels::MemoryCardListPanel_Simple* g_uglyPanel = NULL; -void g_uglyFunc() -{ - if (g_uglyPanel) - g_uglyPanel->OnChangedListSelection(); -} - -Panels::MemoryCardListPanel_Simple::~MemoryCardListPanel_Simple() { g_uglyPanel = NULL; } - -Panels::MemoryCardListPanel_Simple::MemoryCardListPanel_Simple(wxWindow* parent) - : _parent(parent) -{ - m_MultitapEnabled[0] = false; - m_MultitapEnabled[1] = false; - - m_listview = new MemoryCardListView_Simple(this); - - m_listview->SetMinSize(wxSize(620, m_listview->GetCharHeight() * 13)); // 740 is nice for default font sizes - - m_listview->SetDropTarget(new McdDropTarget(m_listview)); - - //m_button_Mount = new wxButton(this, wxID_ANY, _("Enable port")); - - m_button_AssignUnassign = new wxButton(this, wxID_ANY, _("Eject")); - m_button_Duplicate = new wxButton(this, wxID_ANY, _("Duplicate ...")); - m_button_Rename = new wxButton(this, wxID_ANY, _("Rename ...")); - m_button_Create = new wxButton(this, wxID_ANY, _("Create ...")); - m_button_Convert = new wxButton(this, wxID_ANY, _("Convert ...")); - - // ------------------------------------ - // Sizer / Layout Section - // ------------------------------------ - - CreateLayout(); - - *s_leftside_buttons += 20; - //*s_leftside_buttons += m_button_Mount; - //*s_leftside_buttons += 20; - - *s_leftside_buttons += Label(_("Card: ")) | pxMiddle; - *s_leftside_buttons += m_button_AssignUnassign; - *s_leftside_buttons += 20; - *s_leftside_buttons += m_button_Duplicate; - *s_leftside_buttons += 2; - *s_leftside_buttons += m_button_Rename; - *s_leftside_buttons += 2; - *s_leftside_buttons += m_button_Create; - *s_leftside_buttons += 2; - *s_leftside_buttons += m_button_Convert; - SetSizerAndFit(GetSizer()); - - parent->SetWindowStyle(parent->GetWindowStyle() | wxRESIZE_BORDER); - - Bind(wxEVT_LIST_BEGIN_DRAG, &MemoryCardListPanel_Simple::OnListDrag, this, m_listview->GetId()); - Bind(wxEVT_LIST_ITEM_SELECTED, &MemoryCardListPanel_Simple::OnListSelectionChanged, this, m_listview->GetId()); - Bind(wxEVT_LIST_ITEM_ACTIVATED, &MemoryCardListPanel_Simple::OnItemActivated, this, m_listview->GetId()); //enter or double click - - //Deselected is not working for some reason (e.g. when clicking an empty row at the table?) - avih - // wxMSW bug for virtual listviews. Works fine on Linux: http://trac.wxwidgets.org/ticket/1919 - turtleli - Bind(wxEVT_LIST_ITEM_DESELECTED, &MemoryCardListPanel_Simple::OnListSelectionChanged, this, m_listview->GetId()); - - Bind(wxEVT_LIST_ITEM_RIGHT_CLICK, &MemoryCardListPanel_Simple::OnOpenItemContextMenu, this, m_listview->GetId()); - - //Bind(wxEVT_BUTTON, &MemoryCardListPanel_Simple::OnMountCard, this, m_button_Mount->GetId()); - Bind(wxEVT_BUTTON, &MemoryCardListPanel_Simple::OnCreateOrDeleteCard, this, m_button_Create->GetId()); - Bind(wxEVT_BUTTON, &MemoryCardListPanel_Simple::OnConvertCard, this, m_button_Convert->GetId()); - Bind(wxEVT_BUTTON, &MemoryCardListPanel_Simple::OnRenameFile, this, m_button_Rename->GetId()); - Bind(wxEVT_BUTTON, &MemoryCardListPanel_Simple::OnDuplicateFile, this, m_button_Duplicate->GetId()); - Bind(wxEVT_BUTTON, &MemoryCardListPanel_Simple::OnAssignUnassignFile, this, m_button_AssignUnassign->GetId()); - - // Popup Menu Connections! - //Bind(McdMenuId_Mount, &MemoryCardListPanel_Simple::OnMountCard, this, McdMenuId_Mount); - Bind(wxEVT_MENU, &MemoryCardListPanel_Simple::OnCreateOrDeleteCard, this, McdMenuId_Create); - Bind(wxEVT_MENU, &MemoryCardListPanel_Simple::OnConvertCard, this, McdMenuId_Convert); - Bind(wxEVT_MENU, &MemoryCardListPanel_Simple::OnRenameFile, this, McdMenuId_Rename); - Bind(wxEVT_MENU, &MemoryCardListPanel_Simple::OnDuplicateFile, this, McdMenuId_Duplicate); - Bind(wxEVT_MENU, &MemoryCardListPanel_Simple::OnAssignUnassignFile, this, McdMenuId_AssignUnassign); - - Bind(wxEVT_MENU, &MemoryCardListPanel_Simple::OnRefreshSelections, this, McdMenuId_RefreshList); - - //because the wxEVT_LIST_ITEM_DESELECTED doesn't work (buttons stay enabled when clicking an empty area of the list), - // m_listview can send us an event that indicates a change at the list. Ugly, but works. - g_uglyPanel = this; - m_listview->setExternHandler(g_uglyFunc); -} - -void Panels::MemoryCardListPanel_Simple::UpdateUI() -{ - if (!m_listview) - return; - - int sel = m_listview->GetFirstSelected(); - - m_button_Create->Enable(); - - if (wxNOT_FOUND == sel) - { - m_button_Create->SetLabel(_("Create ...")); - pxSetToolTip(m_button_Create, _("Create a new memory card.")); - - // m_button_Mount->Disable(); - m_button_Rename->Disable(); - m_button_Duplicate->Disable(); - m_button_AssignUnassign->Disable(); - m_button_Convert->Disable(); - return; - } - - const McdSlotItem& card(GetCardForViewIndex(sel)); - - - m_button_Rename->Enable(card.IsPresent); - wxString renameTip = _("Rename this memory card ..."); - pxSetToolTip(m_button_Rename, renameTip); - - m_button_AssignUnassign->Enable(card.IsPresent); - m_button_AssignUnassign->SetLabel(card.Slot >= 0 ? _("Eject") : _("Insert ...")); - wxString assignTip = (card.Slot >= 0) ? _("Eject the card from this port") : _("Insert this card to a port ..."); - pxSetToolTip(m_button_AssignUnassign, assignTip); - - m_button_Duplicate->Enable(card.IsPresent); - wxString dupTip = _("Create a duplicate of this memory card ..."); - pxSetToolTip(m_button_Duplicate, dupTip); - - m_button_Convert->Enable(card.IsPresent && card.IsFormatted && !card.IsPSX); - pxSetToolTip(m_button_Convert, _("Convert this memory card to or from a folder memory card. Creates a duplicate of the current memory card in the new type.\n\n" - "Note: Only available when a memory card is formatted. Not available for PSX memory cards.")); - - //m_button_Create->Enable( card.Slot>=0 || card.IsPresent); - m_button_Create->SetLabel(card.IsPresent ? _("Delete") : _("Create ...")); - - if (card.IsPresent) - pxSetToolTip(m_button_Create, _("Permanently delete this memory card from disk (all contents are lost)")); - else if (card.Slot >= 0) - pxSetToolTip(m_button_Create, _("Create a new memory card and assign it to this Port.")); - else - pxSetToolTip(m_button_Create, _("Create a new memory card.")); - - /* - m_button_Mount->Enable( card.IsPresent && card.Slot>=0); - m_button_Mount->SetLabel( card.IsEnabled ? _("Disable Port") : _("Enable Port") ); - pxSetToolTip( m_button_Mount, - card.IsEnabled - ? _("Disable the selected PS2-Port (this memory card will be invisible to games/BIOS).") - : _("Enable the selected PS2-Port (games/BIOS will see this memory card).") - ); -*/ -} - -void Panels::MemoryCardListPanel_Simple::Apply() -{ - _parent::Apply(); - - int used = 0; - Console.WriteLn("Apply memory cards:"); - for (uint slot = 0; slot < 8; ++slot) - { - g_Conf->EmuOptions.Mcd[slot].Type = m_Cards[slot].Type; - g_Conf->EmuOptions.Mcd[slot].Enabled = m_Cards[slot].IsEnabled && m_Cards[slot].IsPresent; - if (m_Cards[slot].IsPresent) - g_Conf->EmuOptions.Mcd[slot].Filename = StringUtil::wxStringToUTF8String(m_Cards[slot].Filename.GetFullName()); - else - g_Conf->EmuOptions.Mcd[slot].Filename.clear(); - - if (g_Conf->EmuOptions.Mcd[slot].Enabled) - { - used++; - Console.WriteLn("slot[%d]='%s'", slot, g_Conf->EmuOptions.Mcd[slot].Filename.c_str()); - } - } - if (!used) - Console.WriteLn("No active slots."); - - AutoEject::SetAll(); -} - -void Panels::MemoryCardListPanel_Simple::AppStatusEvent_OnSettingsApplied() -{ - for (uint slot = 0; slot < 8; ++slot) - { - m_Cards[slot].IsEnabled = g_Conf->EmuOptions.Mcd[slot].Enabled; - m_Cards[slot].Filename = StringUtil::UTF8StringToWxString(g_Conf->EmuOptions.Mcd[slot].Filename); - - // Automatically create the enabled but non-existing file such that it can be managed (else will get created anyway on boot) - wxString targetFile = (GetMcdPath() + m_Cards[slot].Filename.GetFullName()).GetFullPath(); - if (m_Cards[slot].IsEnabled && !(wxFileExists(targetFile) || wxDirExists(targetFile))) - { - wxString errMsg; - if (isValidNewFilename(m_Cards[slot].Filename.GetFullName(), GetMcdPath(), errMsg, 5)) - { - if (!Dialogs::CreateMemoryCardDialog::CreateIt(targetFile, 8, false)) - { - Console.Error("Automatic creation of memory card '%ls' failed. Hope for the best...", WX_STR(targetFile)); - } - else - { - Console.WriteLn("Memory card created: '%ls'.", WX_STR(targetFile)); - } - } - else - { - Console.Error("Memory card was enabled, but it had an invalid file name. Aborting automatic creation. Hope for the best... (%ls)", WX_STR(errMsg)); - } - } - - if (!m_Cards[slot].IsEnabled || !(wxFileExists(targetFile) || wxDirExists(targetFile))) - { - m_Cards[slot].IsEnabled = false; - m_Cards[slot].IsPresent = false; - m_Cards[slot].Filename = L""; - } - } - DoRefresh(); - - _parent::AppStatusEvent_OnSettingsApplied(); -} - - -//BUG: the next function is never reached because, for some reason, IsoDropTarget::OnDropFiles is called instead. -// Interestingly, IsoDropTarget::OnDropFiles actually "detects" a memory card file as a valid Audio-CD ISO... - avih -bool Panels::MemoryCardListPanel_Simple::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) -{ - if (filenames.GetCount() == 1 && wxFileName(filenames[0]).IsDir()) - { - m_FolderPicker->SetPath(filenames[0]); - return true; - } - return false; -} - -bool Panels::MemoryCardListPanel_Simple::ValidateEnumerationStatus() -{ - if (m_listview) - m_listview->SetMcdProvider(NULL); - return false; -} - -void Panels::MemoryCardListPanel_Simple::DoRefresh() -{ - for (uint slot = 0; slot < 8; ++slot) - { - //if( FileMcd_IsMultitapSlot(slot) && !m_MultitapEnabled[FileMcd_GetMtapPort(slot)] ) - // continue; - - //wxFileName fullpath( m_FolderPicker->GetPath() + g_Conf->Mcd[slot].Filename.GetFullName() ); - wxFileName fullpath = m_FolderPicker->GetPath() + m_Cards[slot].Filename.GetFullName(); - - EnumerateMemoryCard(m_Cards[slot], fullpath, m_FolderPicker->GetPath()); - m_Cards[slot].Slot = slot; - } - - ReadFilesAtMcdFolder(); - - - if (m_listview) - m_listview->SetMcdProvider(this); - UpdateUI(); -} - - -// ===================================================================================================== -// MemoryCardListPanel_Simple (implementations) -// ===================================================================================================== - -void Panels::MemoryCardListPanel_Simple::UiCreateNewCard(McdSlotItem& card) -{ - // card can also be the filesystem placeholder. On that case, the changes - // made to it will be reverted on refresh, and we'll just have a new card at the folder. - if (card.IsPresent) - { - Console.WriteLn("Error: Aborted: create memory card invoked, but a file is already associated."); - return; - } - - Dialogs::CreateMemoryCardDialog dialog(this, m_FolderPicker->GetPath(), L"my memory card"); - wxWindowID result = dialog.ShowModal(); - - if (result != wxID_CANCEL) - { - card.IsEnabled = true; - card.Filename = dialog.result_createdMcdFilename; - card.IsPresent = true; - if (card.Slot >= 0) - { - Console.WriteLn("Setting new memory card to slot %u: '%ls'", card.Slot, WX_STR(card.Filename.GetFullName())); - } - else - { - Console.WriteLn("Created a new unassigned memory card file: '%ls'", WX_STR(card.Filename.GetFullName())); - } - } - else - { - card.IsEnabled = false; - } - - Apply(); - RefreshSelections(); -} - -void Panels::MemoryCardListPanel_Simple::UiConvertCard(McdSlotItem& card) -{ - if (!card.IsPresent) - { - Console.WriteLn("Error: Aborted: Convert memory card invoked, but a file is not associated."); - return; - } - - Dialogs::ConvertMemoryCardDialog dialog(this, m_FolderPicker->GetPath(), card.Type, card.Filename.GetFullName()); - wxWindowID result = dialog.ShowModal(); - - if (result != wxID_CANCEL) - { - Apply(); - RefreshSelections(); - } -} - -void Panels::MemoryCardListPanel_Simple::UiDeleteCard(McdSlotItem& card) -{ - if (!card.IsPresent) - { - Console.WriteLn("Error: Aborted: delete memory card invoked, but a file is not associated."); - return; - } - - bool result = true; - if (card.IsFormatted) - { - wxString content; - content.Printf( - pxE(L"You are about to delete the formatted memory card '%s'. All data on this card will be lost! Are you absolutely and quite positively sure?"), WX_STR(card.Filename.GetFullName())); - - result = Msgbox::YesNo(content, _("Delete memory file?")); - } - - if (result) - { - - wxFileName fullpath(m_FolderPicker->GetPath() + card.Filename.GetFullName()); - - card.IsEnabled = false; - Apply(); - - if (fullpath.FileExists()) - { - wxRemoveFile(fullpath.GetFullPath()); - } - else - { - RemoveWxDirectory(fullpath.GetFullPath()); - } - - RefreshSelections(); - } -} - -bool Panels::MemoryCardListPanel_Simple::UiDuplicateCard(McdSlotItem& src, McdSlotItem& dest) -{ - wxDirName basepath = GetMcdPath(); - if (!src.IsPresent) - { - Msgbox::Alert(_("Failed: Can only duplicate an existing card."), _("Duplicate memory card")); - return false; - } - - if (dest.IsPresent && dest.Slot != -1) - { - wxString content; - content.Printf( - pxE(L"Failed: Duplicate is only allowed to an empty PS2-Port or to the file system.")); - - Msgbox::Alert(content, _("Duplicate memory card")); - return false; - } - - while (1) - { - wxString newFilename = L""; - newFilename = wxGetTextFromUser(_("Select a name for the duplicate\n( '.ps2' will be added automatically)"), _("Duplicate memory card")); - if (newFilename == L"") - { - //Msgbox::Alert( _("Duplicate canceled"), _("Duplicate memory card") ); - return false; - } - newFilename += L".ps2"; - - //check that the name is valid for a new file - wxString errMsg; - if (!isValidNewFilename(newFilename, basepath, errMsg, 5)) - { - wxString message; - message.Printf(_("Failed: %s"), WX_STR(errMsg)); - Msgbox::Alert(message, _("Duplicate memory card")); - continue; - } - - dest.Filename = newFilename; - break; - } - - wxFileName srcfile(basepath + src.Filename); - wxFileName destfile(basepath + dest.Filename); - - ScopedBusyCursor doh(Cursor_ReallyBusy); - - if (!((srcfile.FileExists() && wxCopyFile(srcfile.GetFullPath(), destfile.GetFullPath(), true)) || (!srcfile.FileExists() && CopyDirectory(srcfile.GetFullPath(), destfile.GetFullPath())))) - { - wxString heading; - heading.Printf(pxE(L"Failed: Destination memory card '%s' is in use."), - WX_STR(dest.Filename.GetFullName()), dest.Slot); - - wxString content; - - Msgbox::Alert(heading + L"\n\n" + content, _("Copy failed!")); - - return false; - } - - // Destination memcard isEnabled state is the same now as the source's - wxString success; - success.Printf(_("Memory card '%s' duplicated to '%s'."), - WX_STR(src.Filename.GetFullName()), - WX_STR(dest.Filename.GetFullName())); - Msgbox::Alert(success, _("Success")); - dest.IsPresent = true; - dest.IsEnabled = true; - - Apply(); - DoRefresh(); - return true; -} - -void Panels::MemoryCardListPanel_Simple::UiRenameCard(McdSlotItem& card) -{ - if (!card.IsPresent) - { - Console.WriteLn("Error: Aborted: Rename memory card invoked, but no file is associated."); - return; - } - - const wxDirName basepath(m_listview->GetMcdProvider().GetMcdPath()); - wxString newFilename; - while (1) - { - wxString title; - title.Printf(_("Select a new name for the memory card '%s'\n( '.ps2' will be added automatically)"), - WX_STR(card.Filename.GetFullName())); - newFilename = wxGetTextFromUser(title, _("Rename memory card")); - if (newFilename == L"") - return; - - newFilename += L".ps2"; - - //check that the name is valid for a new file - wxString errMsg; - if (!isValidNewFilename(newFilename, basepath, errMsg, 5)) - { - wxString message; - message.Printf(_("Error (%s)"), WX_STR(errMsg)); - Msgbox::Alert(message, _("Rename memory card")); - continue; - } - - break; - } - - bool origEnabled = card.IsEnabled; - card.IsEnabled = false; - Apply(); - if (!wxRenameFile((basepath + card.Filename).GetFullPath(), (basepath + wxFileName(newFilename)).GetFullPath(), false)) - { - card.IsEnabled = origEnabled; - Apply(); - Msgbox::Alert(_("Error: Rename could not be completed.\n"), _("Rename memory card")); - - return; - } - - card.Filename = newFilename; - card.IsEnabled = origEnabled; - Apply(); - - RefreshSelections(); -} - -void Panels::MemoryCardListPanel_Simple::OnCreateOrDeleteCard(wxCommandEvent& evt) -{ - int selectedViewIndex = m_listview->GetFirstSelected(); - if (wxNOT_FOUND == selectedViewIndex) - selectedViewIndex = -1; //get filesystem placeholder, just create a new card at the filesystem. - - McdSlotItem& card(GetCardForViewIndex(selectedViewIndex)); - - if (card.IsPresent) - UiDeleteCard(card); - else - UiCreateNewCard(card); -} - -void Panels::MemoryCardListPanel_Simple::OnConvertCard(wxCommandEvent& evt) -{ - int selectedViewIndex = m_listview->GetFirstSelected(); - if (wxNOT_FOUND == selectedViewIndex) - { - return; - } - - McdSlotItem& card(GetCardForViewIndex(selectedViewIndex)); - if (card.IsPresent) - { - UiConvertCard(card); - } -} - -//enable/disapbe port -/* -void Panels::MemoryCardListPanel_Simple::OnMountCard(wxCommandEvent& evt) -{ - evt.Skip(); - - const int selectedViewIndex = m_listview->GetFirstSelected(); - if( wxNOT_FOUND == selectedViewIndex ) return; - - McdSlotItem& card( GetCardForViewIndex(selectedViewIndex) ); - - card.IsEnabled = !card.IsEnabled; - m_listview->RefreshItem(selectedViewIndex); - UpdateUI(); -} -*/ -/* -//text dialog: can be used for rename: wxGetTextFromUser - avih -void Panels::MemoryCardListPanel_Simple::OnRelocateCard(wxCommandEvent& evt) -{ - evt.Skip(); - - const int slot = m_listview->GetFirstSelected(); - if( wxNOT_FOUND == slot ) return; - - // Issue a popup to the user that allows them to pick a new .PS2 file to serve as - // the new host memorycard file for the slot. The dialog has a number of warnings - // present to reiterate that this is an advanced operation that PCSX2 may not - // support very well (ie, might be buggy). - - m_listview->RefreshItem(slot); - UpdateUI(); -} -*/ - -// enter/double-click -void Panels::MemoryCardListPanel_Simple::OnItemActivated(wxListEvent& evt) -{ - const int viewIndex = m_listview->GetFirstSelected(); - if (wxNOT_FOUND == viewIndex) - return; - McdSlotItem& card(GetCardForViewIndex(viewIndex)); - - if (card.IsPresent) - UiRenameCard(card); - else if (card.Slot >= 0) - UiCreateNewCard(card); // IsPresent==false can only happen for an internal slot (vs filename on the HD), so a card can be created. -} - -void Panels::MemoryCardListPanel_Simple::OnDuplicateFile(wxCommandEvent& evt) -{ - const int viewIndex = m_listview->GetFirstSelected(); - if (wxNOT_FOUND == viewIndex) - return; - McdSlotItem& card(GetCardForViewIndex(viewIndex)); - - pxAssert(card.IsPresent); - McdSlotItem dummy; - UiDuplicateCard(card, dummy); -} - -wxString GetPortName(int slotIndex) -{ - if (slotIndex == 0 || slotIndex == 1) - return pxsFmt(wxString(L" ") + _("Port-%u / Multitap-%u--Port-1"), FileMcd_GetMtapPort(slotIndex) + 1, FileMcd_GetMtapPort(slotIndex) + 1); - return pxsFmt(wxString(L" ") + _(" Multitap-%u--Port-%u"), FileMcd_GetMtapPort(slotIndex) + 1, FileMcd_GetMtapSlot(slotIndex) + 1); -} - -void Panels::MemoryCardListPanel_Simple::UiAssignUnassignFile(McdSlotItem& card) -{ - pxAssert(card.IsPresent); - - if (card.Slot >= 0) - { //eject - card.IsEnabled = false; - card.IsPresent = false; - card.Filename = L""; - DoRefresh(); - } - else - { //insert into a (UI) selected slot - wxArrayString selections; - int i; - for (i = 0; i < GetNumVisibleInternalSlots(); i++) - { - McdSlotItem& selCard = GetCardForViewIndex(i); - wxString sel = GetPortName(selCard.Slot) + L" ( "; - if (selCard.IsPresent) - sel += selCard.Filename.GetFullName(); - else - sel += _("Empty"); - sel += L" )"; - - selections.Add(sel); - } - wxString title; - title.Printf(_("Select a target port for '%s'"), WX_STR(card.Filename.GetFullName())); - int res = wxGetSingleChoiceIndex(title, _("Insert card"), selections, this); - if (res < 0) - return; - - McdSlotItem& target = GetCardForViewIndex(res); - bool en = target.IsPresent ? target.IsEnabled : true; - RemoveCardFromSlot(card.Filename); - target.Filename = card.Filename; - target.IsPresent = true; - target.IsEnabled = en; - DoRefresh(); - } -} -void Panels::MemoryCardListPanel_Simple::OnAssignUnassignFile(wxCommandEvent& evt) -{ - const int viewIndex = m_listview->GetFirstSelected(); - if (wxNOT_FOUND == viewIndex) - return; - McdSlotItem& card(GetCardForViewIndex(viewIndex)); - - UiAssignUnassignFile(card); -} - -void Panels::MemoryCardListPanel_Simple::OnRenameFile(wxCommandEvent& evt) -{ - const int viewIndex = m_listview->GetFirstSelected(); - if (wxNOT_FOUND == viewIndex) - return; - McdSlotItem& card(GetCardForViewIndex(viewIndex)); - - UiRenameCard(card); -} - - -void Panels::MemoryCardListPanel_Simple::OnListDrag(wxListEvent& evt) -{ - int selectionViewIndex = m_listview->GetFirstSelected(); - - if (selectionViewIndex < 0) - return; - wxCustomDataObject my_data(drag_drop_format); - my_data.SetData(sizeof(int), &selectionViewIndex); - - wxDropSource dragSource(m_listview); - dragSource.SetData(my_data); - /*wxDragResult result = */ dragSource.DoDragDrop(wxDrag_DefaultMove); -} - -void Panels::MemoryCardListPanel_Simple::OnListSelectionChanged(wxListEvent& evt) -{ - UpdateUI(); -} - -void Panels::MemoryCardListPanel_Simple::OnOpenItemContextMenu(wxListEvent& evt) -{ - int idx = evt.GetIndex(); - - wxMenu* junk = new wxMenu(); - - if (idx != wxNOT_FOUND) - { - const McdSlotItem& card(GetCardForViewIndex(idx)); - - if (card.IsPresent) - { - junk->Append(McdMenuId_AssignUnassign, card.Slot >= 0 ? _("&Eject card") : _("&Insert card ...")); - junk->Append(McdMenuId_Duplicate, _("D&uplicate card ...")); - junk->Append(McdMenuId_Rename, _("&Rename card ...")); - junk->Append(McdMenuId_Create, _("&Delete card")); - if (card.IsFormatted && !card.IsPSX) - { - junk->Append(McdMenuId_Convert, _("&Convert card")); - } - } - else - { - junk->Append(McdMenuId_Create, _("&Create a new card ...")); - } - } - else - { - junk->Append(McdMenuId_Create, _("&Create a new card ...")); - } - - junk->AppendSeparator(); - - junk->Append(McdMenuId_RefreshList, _("Re&fresh List")); - - PopupMenu(junk); - m_listview->RefreshItem(idx); - UpdateUI(); -} - -void Panels::MemoryCardListPanel_Simple::ReadFilesAtMcdFolder() -{ - //Dir enumeration/iteration code courtesy of cotton. - avih. - while (!m_allFilesystemCards.empty()) - m_allFilesystemCards.pop_back(); - - m_filesystemPlaceholderCard.Slot = -1; - m_filesystemPlaceholderCard.IsEnabled = false; - m_filesystemPlaceholderCard.IsPresent = false; - m_filesystemPlaceholderCard.Filename = L""; - - - wxArrayString memcardList; - wxString filename = m_FolderPicker->GetPath().ToString(); - wxDir memcardDir(filename); - if (memcardDir.IsOpened()) - { - // add memory card files - wxDir::GetAllFiles(filename, &memcardList, L"*.ps2", wxDIR_FILES); - wxDir::GetAllFiles(filename, &memcardList, L"*.bin", wxDIR_FILES); - wxDir::GetAllFiles(filename, &memcardList, L"*.mcd", wxDIR_FILES); - wxDir::GetAllFiles(filename, &memcardList, L"*.mcr", wxDIR_FILES); - - // add memory card folders - wxString dirname; - if (memcardDir.GetFirst(&dirname, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN)) - { - do - { - wxFileName superBlockFileName(wxFileName(filename, dirname).GetFullPath(), L"_pcsx2_superblock"); - if (superBlockFileName.FileExists()) - { - memcardList.Add(superBlockFileName.GetPath()); - } - } while (memcardDir.GetNext(&dirname)); - } - } - - - for (uint i = 0; i < memcardList.size(); i++) - { - McdSlotItem currentCardFile; - bool isOk = EnumerateMemoryCard(currentCardFile, memcardList[i], m_FolderPicker->GetPath()); - if (isOk && !isFileAssignedAndVisibleOnList(currentCardFile.Filename)) - { - currentCardFile.Slot = -1; - currentCardFile.IsEnabled = false; - m_allFilesystemCards.push_back(currentCardFile); - //DevCon.WriteLn(L"Enumerated file: '%s'", WX_STR(currentCardFile.Filename.GetFullName()) ); - } - /*else - DevCon.WriteLn(L"MCD folder card file skipped: '%s'", WX_STR(memcardList[i]) );*/ - } -} - - -bool Panels::MemoryCardListPanel_Simple::IsSlotVisible(int slotIndex) const -{ - if (slotIndex < 0 || slotIndex >= 8) - return false; - if (!m_MultitapEnabled[0] && 2 <= slotIndex && slotIndex <= 4) - return false; - if (!m_MultitapEnabled[1] && 5 <= slotIndex && slotIndex <= 7) - return false; - return true; -} -//whether or not this filename appears on the ports at the list (takes into account MT enabled/disabled) -bool Panels::MemoryCardListPanel_Simple::isFileAssignedAndVisibleOnList(const wxFileName cardFile) const -{ - int i; - for (i = 0; i < 8; i++) - if (IsSlotVisible(i) && cardFile.GetFullName() == m_Cards[i].Filename.GetFullName()) - return true; - - return false; -} - -//whether or not this filename is assigned to a ports (regardless if MT enabled/disabled) -bool Panels::MemoryCardListPanel_Simple::isFileAssignedToInternalSlot(const wxFileName cardFile) const -{ - int i; - for (i = 0; i < 8; i++) - if (cardFile.GetFullName() == m_Cards[i].Filename.GetFullName()) - return true; - - return false; -} - -void Panels::MemoryCardListPanel_Simple::RemoveCardFromSlot(const wxFileName cardFile) -{ - int i; - for (i = 0; i < 8; i++) - if (cardFile.GetFullName() == m_Cards[i].Filename.GetFullName()) - { - m_Cards[i].Filename = L""; - m_Cards[i].IsPresent = false; - m_Cards[i].IsEnabled = false; - } -} - -int Panels::MemoryCardListPanel_Simple::GetNumFilesVisibleAsFilesystem() const -{ - return m_allFilesystemCards.size(); -} - - -bool Panels::MemoryCardListPanel_Simple::IsNonEmptyFilesystemCards() const -{ - return GetNumFilesVisibleAsFilesystem() > 0; -} - -McdSlotItem& Panels::MemoryCardListPanel_Simple::GetNthVisibleFilesystemCard(int n) -{ - return m_allFilesystemCards.at(n); -} - -int Panels::MemoryCardListPanel_Simple::GetNumVisibleInternalSlots() const -{ - uint baselen = 2; - if (m_MultitapEnabled[0]) - baselen += 3; - if (m_MultitapEnabled[1]) - baselen += 3; - return baselen; -} - -// Interface Implementation for IMcdList -int Panels::MemoryCardListPanel_Simple::GetLength() const -{ - uint baselen = GetNumVisibleInternalSlots(); - baselen++; //filesystem placeholder - baselen += GetNumFilesVisibleAsFilesystem(); - return baselen; -} - - -//Translates a list-view index (idx) to an internal memory card slot. -//This method effectively defines the arrangement of the card slots at the list view. -//The internal card slots array is fixed as sollows: -// slot 0: mcd1 (= MT1 slot 1) -// slot 1: mcd2 (= MT2 slot 1) -// slots 2,3,4: MT1 slots 2,3,4 -// slots 5,6,7: MT2 slots 2,3,4 -// -//however, the list-view doesn't show MT slots when this MT is disabled, -// so the view-index should "shift" to point at the real card slot. -//While we're at it, we can alternatively enforce any other arrangment of the view by -// using any other set of 'view-index-to-card-slot' translating that we'd like. -int Panels::MemoryCardListPanel_Simple::GetSlotIndexForViewIndex(int listViewIndex) -{ - pxAssert(0 <= listViewIndex && listViewIndex < GetNumVisibleInternalSlots()); - int targetSlot = -1; - - /* - //this list-view arrangement is mostly kept aligned with the internal slots indexes, and only takes care - // of the case where MT1 is disabled (hence the MT2 slots 2,3,4 "move backwards" 3 places on the view-index) - // However, this arrangement it's not very intuitive to use... - if (!m_MultitapEnabled[0] && listViewIndex>=2) - { - //we got an MT2 slot. - assert(listViewIndex < 5); - targetSlot = listViewIndex+3; - } - else - { - targetSlot=listViewIndex;//identical view-index and card slot. - } -*/ - - //This arrangement of list-view is as follows: - //mcd1(=MT1 port 1) - //[MT1 port 2,3,4 if MT1 is enabled] - //mcd2(=MT2 slot 1) - //[MT2 port 2,3,4 if MT2 is enabled] - - if (m_MultitapEnabled[0]) - { - //MT1 enabled: - if (1 <= listViewIndex && listViewIndex <= 3) - { //MT1 ports 2/3/4 move one place backwards - targetSlot = listViewIndex + 1; - } - else if (listViewIndex == 4) - { //mcd2 (=MT2 port 1) moves 3 places forward - targetSlot = 1; - } - else - { //mcd1 keeps it's pos as first, MT2 ports keep their pos at the end of the list. - targetSlot = listViewIndex; - } - } - else - { - //MT1 disabled: mcd1 and mcd2 stay put, MT2 ports 2,3,4 come next (move backwards 3 places) - if (2 <= listViewIndex && listViewIndex <= 4) - targetSlot = listViewIndex + 3; - else - targetSlot = listViewIndex; - } - - pxAssert(0 <= targetSlot && targetSlot <= 7); - return targetSlot; -} - - -McdSlotItem& Panels::MemoryCardListPanel_Simple::GetCardForViewIndex(int idx) -{ - pxAssert(-1 <= idx && idx < GetNumVisibleInternalSlots() + 1 + GetNumFilesVisibleAsFilesystem()); - - if (0 <= idx && idx < GetNumVisibleInternalSlots()) - return m_Cards[GetSlotIndexForViewIndex(idx)]; - - if (idx == -1 || idx == GetNumVisibleInternalSlots()) - return this->m_filesystemPlaceholderCard; - - return this->m_allFilesystemCards.at(idx - GetNumVisibleInternalSlots() - 1); -} diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp deleted file mode 100644 index 2a1e6c1d45..0000000000 --- a/pcsx2/gui/Panels/MemoryCardListView.cpp +++ /dev/null @@ -1,214 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ConfigurationPanels.h" -#include "MemoryCardPanels.h" - -#include "gui/Dialogs/ConfigurationDialog.h" - -#include "gui/IniInterface.h" - -using namespace pxSizerFlags; -using namespace Panels; - -// -------------------------------------------------------------------------------------- -// BaseMcdListView (implementations) -// -------------------------------------------------------------------------------------- - -void BaseMcdListView::SetMcdProvider( IMcdList* face ) -{ - m_CardProvider = face; - SetCardCount( m_CardProvider ? m_CardProvider->GetLength() : 0 ); -} - -IMcdList& BaseMcdListView::GetMcdProvider() -{ - pxAssert( m_CardProvider ); - return *m_CardProvider; -} - -void BaseMcdListView::LoadSaveColumns( IniInterface& ini ) -{ - FastFormatUnicode label; - uint colcnt = GetColumnCount(); - for( uint col=0; colGetCardForViewIndex(item) ); - wxString prefix=L" "; - - switch( column ) - { - case McdColS_PortSlot: - if (it.Slot>=0) - { - if( !it.IsMultitapSlot() ) - return pxsFmt(wxString(L" ") + _("Port-%u / Multitap-%u--Port-1"), it.GetMtapPort()+1, it.GetMtapPort()+1); - return pxsFmt(wxString(L" ")+_(" Multitap-%u--Port-%u"), it.GetMtapPort()+1, it.GetMtapSlot()+1); - } - - return L""; -/* - case McdColS_Status: - { - wxString res = prefix + (it.IsEnabled ? _("Enabled") : _("Disabled")); - if( !it.IsPresent && it.Slot>=0 ) - res = prefix + _("Empty"); - else if ( it.Slot == -1 ) - res= L""; - return prefix + res; - } -*/ - case McdColS_Size: return prefix + ( !it.IsPresent ? L"" : (it.IsPSX? pxsFmt( L"%u MBit", it.SizeInMB ) : ( it.SizeInMB > 0 ? pxsFmt( L"%u MiB", it.SizeInMB ) : L"Auto" ) ) ); - case McdColS_Formatted: return prefix + ( !it.IsPresent ? L"" : ( it.IsFormatted ? _("Yes") : _("No")) ); - case McdColS_Type: return prefix + ( !it.IsPresent ? L"" : ( it.IsPSX? _("PS1") : _("PS2")) ); - case McdColS_DateModified: return prefix + ( !it.IsPresent || !it.DateModified.IsValid() ? L"" : it.DateModified.FormatDate() ); - case McdColS_DateCreated: return prefix + ( !it.IsPresent || !it.DateCreated.IsValid() ? L"" : it.DateCreated.FormatDate() ); - - case McdColS_Filename: - { - if (!it.IsPresent && it.Slot!=-1) return L""; - else if (!it.IsPresent && it.Slot==-1) - { - //UGLY #2: because this method must be const to be used at the list, - // it cannot access GetMcdProvider() which isn't (and shouldn't be) const. - //so.. a plain old cast does the trick. Hope it's not too bad. - avih. - if (((MemoryCardListView_Simple*)this)->GetMcdProvider().IsNonEmptyFilesystemCards()) - return _("[-- Disabled cards --]"); - else - return _("[-- No cards --]"); - } - - wxDirName filepath( it.Filename.GetPath() ); - - if (filepath.SameAs(g_Conf->Folders.MemoryCards)) - return prefix + it.Filename.GetFullName(); - else - return prefix + it.Filename.GetFullPath(); - } - } - - pxFail( "Unknown column index in MemoryCardListView -- returning an empty string." ); - return wxEmptyString; -} - -// return the icon for the given item. In report view, OnGetItemImage will -// only be called for the first column. See OnGetItemColumnImage for -// details. -int MemoryCardListView_Simple::OnGetItemImage(long item) const -{ - return _parent::OnGetItemImage( item ); -} - -// return the icon for the given item and column. -int MemoryCardListView_Simple::OnGetItemColumnImage(long item, long column) const -{ - return _parent::OnGetItemColumnImage( item, column ); -} - -static wxListItemAttr m_ItemAttr; - -// return the attribute for the item (may return NULL if none) -wxListItemAttr* MemoryCardListView_Simple::OnGetItemAttr(long item) const -{ - //m_disabled.SetTextColour( wxLIGHT_GREY ); - //m_targeted.SetBackgroundColour( wxColour(L"Yellow") ); - - if( !m_CardProvider ) return _parent::OnGetItemAttr(item); - const McdSlotItem& it( m_CardProvider->GetCardForViewIndex(item) ); - - m_ItemAttr = wxListItemAttr(); // Wipe it clean! - - if( it.Slot==-1 || it.IsPresent && !it.IsEnabled) - m_ItemAttr.SetTextColour( *wxLIGHT_GREY ); - - return &m_ItemAttr; -} diff --git a/pcsx2/gui/Panels/MemoryCardPanels.h b/pcsx2/gui/Panels/MemoryCardPanels.h deleted file mode 100644 index 2ea360a01c..0000000000 --- a/pcsx2/gui/Panels/MemoryCardPanels.h +++ /dev/null @@ -1,310 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "gui/AppCommon.h" - -#include -#include - -struct ListViewColumnInfo -{ - const wxChar* name; - int width; - wxListColumnFormat align; -}; - -// -------------------------------------------------------------------------------------- -// McdListItem / IMcdList -// -// These are the items at the list-view. -// Each item holds: -// - An internal slot association (or -1 if it isn't associated with an internal slot) -// - Properties of the internal slot (when associated with one) -// - Properties of the file associated with this list item (when associated with one) -// -------------------------------------------------------------------------------------- -struct McdSlotItem -{ - int Slot; //0-7: internal slot. -1: unrelated to an internal slot (the rest of the files at the folder). - bool IsPresent; //Whether or not a file is associated with this item (true/false when 0<=Slot<=7. Always true when Slot==-1) - MemoryCardType Type; //The implementation used for this memory card - - //Only meaningful when IsPresent==true (a file exists for this item): - wxFileName Filename; // full pathname - bool IsFormatted; - bool IsPSX; // False: PS2 memory card, True: PSX memory card - uint SizeInMB; // size, in megabytes! - wxDateTime DateCreated; - wxDateTime DateModified; - - //Only meaningful when 0<=Slot<=7 (associated with an internal slot): - // Properties of an internal slot, and translation from internal slot index to ps2 physical port (0-based-indexes). - bool IsEnabled; //This slot is enabled/disabled - bool IsMultitapSlot() const; - uint GetMtapPort() const; - uint GetMtapSlot() const; - - bool operator==( const McdSlotItem& right ) const; - bool operator!=( const McdSlotItem& right ) const; - - McdSlotItem() - { - Slot = -1; - SizeInMB = 0; - Type = MemoryCardType::Empty; - - IsPSX = false; - IsPresent = false; - IsEnabled = false; - IsFormatted = false; - } - -}; - -typedef std::vector McdList; - -class IMcdList -{ -public: - virtual void RefreshMcds() const=0; - virtual int GetLength() const=0; - virtual McdSlotItem& GetCardForViewIndex( int idx )=0; - virtual int GetSlotIndexForViewIndex( int listViewIndex )=0; - virtual wxDirName GetMcdPath() const=0; - virtual void PublicApply() =0; - virtual bool isFileAssignedToInternalSlot(const wxFileName cardFile) const =0; - virtual void RemoveCardFromSlot(const wxFileName cardFile) =0; - virtual bool IsNonEmptyFilesystemCards() const =0; - virtual bool UiDuplicateCard( McdSlotItem& src, McdSlotItem& dest ) =0; - -}; - -// -------------------------------------------------------------------------------------- -// BaseMcdListView -// -------------------------------------------------------------------------------------- -class BaseMcdListView : public wxListView -{ - typedef wxListView _parent; - -protected: - IMcdList* m_CardProvider; - -public: - void (*m_externHandler)(void); - void setExternHandler(void (*f)(void)){m_externHandler=f;}; - void OnChanged(wxEvent& evt){if (m_externHandler) m_externHandler(); evt.Skip();} - - virtual ~BaseMcdListView() = default; - BaseMcdListView( wxWindow* parent ) - : _parent( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_VIRTUAL ) - { - m_externHandler=NULL; - Bind(wxEVT_LEFT_UP, &BaseMcdListView::OnChanged, this, this->GetId()); - - m_CardProvider = NULL; - } - - virtual void SetCardCount( int length )=0; - virtual void SetMcdProvider( IMcdList* face ); - - virtual void LoadSaveColumns( IniInterface& ini ); - virtual const ListViewColumnInfo& GetDefaultColumnInfo( uint idx ) const=0; - - virtual IMcdList& GetMcdProvider(); -}; - -// -------------------------------------------------------------------------------------- -// MemoryCardListView_Simple -// -------------------------------------------------------------------------------------- -class MemoryCardListView_Simple : public BaseMcdListView -{ - typedef BaseMcdListView _parent; - -public: - virtual ~MemoryCardListView_Simple() = default; - MemoryCardListView_Simple( wxWindow* parent ); - - void CreateColumns(); - - virtual void SetCardCount( int length ); - virtual const ListViewColumnInfo& GetDefaultColumnInfo( uint idx ) const; - -protected: - // Overrides for wxLC_VIRTUAL - virtual wxString OnGetItemText(long item, long column) const; - virtual int OnGetItemImage(long item) const; - virtual int OnGetItemColumnImage(long item, long column) const; - virtual wxListItemAttr *OnGetItemAttr(long item) const; -}; - - -namespace Panels -{ - // -------------------------------------------------------------------------------------- - // BaseMcdListPanel - // -------------------------------------------------------------------------------------- - class BaseMcdListPanel - : public BaseSelectorPanel - , public wxFileDropTarget - , public IMcdList // derived classes need to implement this - { - typedef BaseSelectorPanel _parent; - - protected: - DirPickerPanel* m_FolderPicker; - BaseMcdListView* m_listview; - wxButton* m_btn_Refresh; - - wxBoxSizer* s_leftside_buttons; - wxBoxSizer* s_rightside_buttons; - - bool m_MultitapEnabled[2]; - - virtual void RefreshMcds() const; - - virtual wxDirName GetMcdPath() const - { - pxAssert(m_FolderPicker); - return m_FolderPicker->GetPath(); - } - - public: - virtual ~BaseMcdListPanel() = default; - BaseMcdListPanel( wxWindow* parent ); - - void CreateLayout(); - void SetMultitapEnabled( uint port, bool enabled ) - { - m_MultitapEnabled[port] = enabled; - RefreshMcds(); - } - - virtual void Apply(); - virtual void AppStatusEvent_OnSettingsApplied(); - }; - - // -------------------------------------------------------------------------------------- - // MemoryCardListPanel_Simple - // -------------------------------------------------------------------------------------- - class MemoryCardListPanel_Simple - : public BaseMcdListPanel - { - typedef BaseMcdListPanel _parent; - - protected: - McdSlotItem m_Cards[8]; - - wxButton* m_button_Rename; - - // Doubles as Create and Delete buttons - wxButton* m_button_Create; - - wxButton* m_button_Convert; - - // Doubles as Mount and Unmount buttons ("Enable"/"Disable" port) -// wxButton* m_button_Mount; - - wxButton* m_button_AssignUnassign; //insert/eject card - wxButton* m_button_Duplicate; - - - public: - virtual ~MemoryCardListPanel_Simple(); - MemoryCardListPanel_Simple( wxWindow* parent ); - - void UpdateUI(); - - // Interface Implementation for IMcdList - virtual int GetLength() const; - - virtual McdSlotItem& GetCardForViewIndex( int idx ); - virtual int GetSlotIndexForViewIndex( int viewIndex ); - virtual void PublicApply(){ Apply(); }; - void OnChangedListSelection(){ UpdateUI(); }; - virtual bool UiDuplicateCard( McdSlotItem& src, McdSlotItem& dest ); - - protected: - void OnCreateOrDeleteCard(wxCommandEvent& evt); - void OnConvertCard(wxCommandEvent& evt); - void OnMountCard(wxCommandEvent& evt); -// void OnRelocateCard(wxCommandEvent& evt); - void OnRenameFile(wxCommandEvent& evt); - void OnDuplicateFile(wxCommandEvent& evt); - void OnAssignUnassignFile(wxCommandEvent& evt); - - void OnListDrag(wxListEvent& evt); - void OnListSelectionChanged(wxListEvent& evt); - void OnOpenItemContextMenu(wxListEvent& evt); - void OnItemActivated(wxListEvent& evt); - - virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames); - - std::vector m_allFilesystemCards; - McdSlotItem m_filesystemPlaceholderCard; - - virtual int GetNumFilesVisibleAsFilesystem() const; - virtual int GetNumVisibleInternalSlots() const; - virtual McdSlotItem& GetNthVisibleFilesystemCard(int n); - virtual bool IsSlotVisible(int slotIndex) const; - virtual void ReadFilesAtMcdFolder(); - virtual bool isFileAssignedAndVisibleOnList(const wxFileName cardFile) const; - virtual bool isFileAssignedToInternalSlot(const wxFileName cardFile) const; - virtual void RemoveCardFromSlot(const wxFileName cardFile); - virtual bool IsNonEmptyFilesystemCards() const; - - virtual void Apply(); - virtual void AppStatusEvent_OnSettingsApplied(); - virtual void DoRefresh(); - virtual bool ValidateEnumerationStatus(); - - virtual void UiRenameCard( McdSlotItem& card ); - virtual void UiCreateNewCard( McdSlotItem& card ); - virtual void UiConvertCard( McdSlotItem& card ); - virtual void UiDeleteCard( McdSlotItem& card ); - virtual void UiAssignUnassignFile( McdSlotItem& card ); - - }; - - // -------------------------------------------------------------------------------------- - // McdConfigPanel_Toggles / McdConfigPanel_Standard / McdConfigPanel_Multitap - // -------------------------------------------------------------------------------------- - class McdConfigPanel_Toggles : public BaseApplicableConfigPanel - { - typedef BaseApplicableConfigPanel _parent; - - protected: - //pxCheckBox* m_check_Multitap[2]; - pxCheckBox* m_check_Ejection; - pxCheckBox* m_folderAutoIndex; - - //moved to the system menu, just below "Save State" - //pxCheckBox* m_check_SavestateBackup; - - public: - McdConfigPanel_Toggles( wxWindow* parent ); - virtual ~McdConfigPanel_Toggles() = default; - void Apply(); - - protected: - void AppStatusEvent_OnSettingsApplied(); - void OnMultitapClicked(); - }; - -}; - -//avih: is the first one used?? -extern bool EnumerateMemoryCard( McdSlotItem& dest, const wxFileName& filename ); -//extern bool EnumerateMemoryCard( SimpleMcdItem& dest, const wxFileName& filename ); diff --git a/pcsx2/gui/Panels/MiscPanelStuff.cpp b/pcsx2/gui/Panels/MiscPanelStuff.cpp deleted file mode 100644 index 3c1d57c0e8..0000000000 --- a/pcsx2/gui/Panels/MiscPanelStuff.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "ConfigurationPanels.h" - -#include "gui/Dialogs/ConfigurationDialog.h" - -#include "ps2/BiosTools.h" - -#include -#include - -using namespace Dialogs; -using namespace pxSizerFlags; - -// -------------------------------------------------------------------------------------- -// DocsFolderPickerPanel -// -------------------------------------------------------------------------------------- -Panels::DocsFolderPickerPanel::DocsFolderPickerPanel( wxWindow* parent, bool isFirstTime ) - : BaseApplicableConfigPanel( parent, wxVERTICAL, _("Usermode Selection") ) -{ - const wxString usermodeExplained( pxE( L"Please select your preferred default location for PCSX2 user-level documents below (includes memory cards, screenshots, settings, and savestates). These folder locations can be overridden at any time using the BIOS Selector panel." - ) ); - - const wxString usermodeWarning( pxE( L"You can change the preferred default location for PCSX2 user-level documents here (includes memory cards, screenshots, settings, and savestates). This option only affects Standard Paths which are set to use the installation default value." - ) ); - - const RadioPanelItem UsermodeOptions[] = - { - RadioPanelItem( - _("User Documents (recommended)"), - _("Location: ") + PathDefs::GetDocuments(DocsFolder_User).ToString() - ), - - RadioPanelItem( - _("Custom folder:"), - wxEmptyString, - _("This setting may require administration privileges from your operating system, depending on how your system is configured.") - ) - }; - - m_radio_UserMode = new pxRadioPanel( this, UsermodeOptions ); - m_radio_UserMode->SetPaddingHoriz( m_radio_UserMode->GetPaddingVert() + 4 ); - m_radio_UserMode->Realize(); - if( pxStaticText* woot = m_radio_UserMode->GetSubText(0) ) woot->Unwrapped(); // wrapping sucks for path names! - - m_dirpicker_custom = new DirPickerPanel( this, FolderId_Documents, AddAppName(_("Select a document root for %s")) ); - - *this += Heading( isFirstTime ? usermodeExplained : usermodeWarning ); - *this += m_radio_UserMode | StdExpand(); - *this += m_dirpicker_custom | pxExpand.Border( wxLEFT, StdPadding + m_radio_UserMode->GetIndentation() ); - *this += 4; - - Bind(wxEVT_RADIOBUTTON, &DocsFolderPickerPanel::OnRadioChanged, this); -} - -DocsModeType Panels::DocsFolderPickerPanel::GetDocsMode() const -{ - return (DocsModeType) m_radio_UserMode->GetSelection(); -} - -void Panels::DocsFolderPickerPanel::Apply() -{ - DocsFolderMode = (DocsModeType) m_radio_UserMode->GetSelection(); - CustomDocumentsFolder = m_dirpicker_custom->GetPath(); -} - -void Panels::DocsFolderPickerPanel::AppStatusEvent_OnSettingsApplied() -{ - if( m_radio_UserMode ) m_radio_UserMode->SetSelection( DocsFolderMode ); - if( m_dirpicker_custom ) m_dirpicker_custom->Enable( DocsFolderMode == DocsFolder_Custom ); -} - -void Panels::DocsFolderPickerPanel::OnRadioChanged( wxCommandEvent& evt ) -{ - evt.Skip(); - - if( !m_radio_UserMode ) return; - - if( m_dirpicker_custom ) - m_dirpicker_custom->Enable( m_radio_UserMode->GetSelection() == (int)DocsFolder_Custom ); - - if( pxStaticText* woot = m_radio_UserMode->GetSubText(0) ) - woot->Enable( m_radio_UserMode->GetSelection() == (int)DocsFolder_User ); -} - -// -------------------------------------------------------------------------------------- -// LanguageSelectionPanel -// -------------------------------------------------------------------------------------- -Panels::LanguageSelectionPanel::LanguageSelectionPanel( wxWindow* parent, bool showApply ) - : BaseApplicableConfigPanel( parent, wxHORIZONTAL ) -{ - m_picker = NULL; - i18n_EnumeratePackages( m_langs ); - - int size = m_langs.size(); - std::unique_ptr compiled( new wxString[size] ); - - for( int i=0; iSetToolTip(_("Make this language my default right now!")); - - *this += applyButton | pxSizerFlags::StdSpace(); - *this += 5; - } - - Bind(wxEVT_BUTTON, &LanguageSelectionPanel::OnApplyLanguage_Clicked, this, pxID_RestartWizard); - - m_picker->SetSelection( 0 ); // always default to System Default -} - -void Panels::LanguageSelectionPanel::OnApplyLanguage_Clicked( wxCommandEvent& evt ) -{ - evt.Skip(); - Apply(); -} - -void Panels::LanguageSelectionPanel::Apply() -{ - if( !m_picker ) return; - - // The combo box's order is sorted and may not match our m_langs order, so - // we have to do a string comparison to find a match: - - wxString sel( m_picker->GetString( m_picker->GetSelection() ) ); - - g_Conf->LanguageCode = L"default"; // use this if no matches found - g_Conf->LanguageId = wxLANGUAGE_DEFAULT; - int size = m_langs.size(); - for( int i=0; iLanguageCode = m_langs[i].canonicalName; - g_Conf->LanguageId = m_langs[i].wxLangId; - } - break; - } - } - -} - -void Panels::LanguageSelectionPanel::AppStatusEvent_OnSettingsApplied() -{ - if (m_picker) - { - m_picker->SetSelection( 0 ); // always default to System Default - - if (g_Conf->LanguageCode.IsEmpty()) - g_Conf->LanguageCode = L"default"; - - for (uint i=0; iLanguageCode)) - { - m_picker->SetSelection( i ); - } - } - } -} diff --git a/pcsx2/gui/Panels/PathsPanel.cpp b/pcsx2/gui/Panels/PathsPanel.cpp deleted file mode 100644 index c35fd2c791..0000000000 --- a/pcsx2/gui/Panels/PathsPanel.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "ConfigurationPanels.h" - -#include - -using namespace pxSizerFlags; - -static const int BetweenFolderSpace = 5; - -// -------------------------------------------------------------------------------------- -// Panels::StandardPathsPanel (implementations) -// -------------------------------------------------------------------------------------- -Panels::StandardPathsPanel::StandardPathsPanel( wxWindow* parent ) - : BaseApplicableConfigPanel( parent ) -{ - *this += BetweenFolderSpace; - *this += (new DirPickerPanel( this, FolderId_Cheats, - _("Cheats:"), - _("Select folder for Cheats") ))-> - SetToolTip( pxEt( L"This folder is where PCSX2 loads cheats from." - ) - ) | SubGroup(); - - *this += BetweenFolderSpace; - *this += (new DirPickerPanel( this, FolderId_Savestates, - _("Savestates:"), - _("Select folder for Savestates") ))-> - SetToolTip( pxEt( L"This folder is where PCSX2 records savestates; which are recorded either by using menus/toolbars, or by pressing F1/F3 (save/load)." - ) - ) | SubGroup(); - - *this += BetweenFolderSpace; - *this += (new DirPickerPanel( this, FolderId_Snapshots, - _("Snapshots:"), - _("Select a folder for Snapshots") ))-> - SetToolTip( pxEt( L"This folder is where PCSX2 saves screenshots." - ) - ) | SubGroup(); - - *this += BetweenFolderSpace; - *this += (new DirPickerPanel( this, FolderId_Logs, - _("Logs/Dumps:" ), - _("Select a folder for logs/dumps") ))-> - SetToolTip( pxEt( L"This folder is where PCSX2 saves its logfiles and diagnostic dumps." - ) - ) | SubGroup(); - - *this += BetweenFolderSpace; - *this += (new DirPickerPanel( this, FolderId_Textures, - _("Textures:"), - _("Select a folder for textures") ))-> - SetToolTip( pxEt( L"This folder is where PCSX2 saves texture dumps and replacements." - ) - ) | SubGroup(); - - /* - *this += BetweenFolderSpace; - *this += (new DirPickerPanel( this, FolderId_MemoryCards, - _("Memorycards:"), - _("Select a default Memorycards folder") ))-> - SetToolTip( pxE( L"This is the default path where PCSX2 loads or creates its memory cards, and can be overridden in the MemoryCard Configuration by using absolute filenames." - ) - ) | SubGroup();*/ - - *this += BetweenFolderSpace; - - GetSizer()->SetMinSize( wxSize( 475, GetSizer()->GetMinSize().GetHeight() ) ); -} - -void Panels::StandardPathsPanel::Apply() -{ - -} - -void Panels::StandardPathsPanel::AppStatusEvent_OnSettingsApplied() -{ - -} - diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp deleted file mode 100644 index bc29649f12..0000000000 --- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp +++ /dev/null @@ -1,366 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "ConfigurationPanels.h" - -using namespace pxSizerFlags; - -const wxChar* Panels::SpeedHacksPanel::GetEECycleRateSliderMsg( int val ) -{ - switch( val ) - { - case -3: - { - m_msg_eeRate->SetForegroundColour(wxColour(L"Red")); - return pxEt(L"50% cyclerate. Significant reduction of CPU requirements. Speedup for very lightweight games, slows down others. FMVs and audio may stutter or skip."); - } - case -2: - { - const wxColour LightRed = wxColour(255, 80, 0); - m_msg_eeRate->SetForegroundColour(LightRed); - return pxEt(L"60% cyclerate. Moderate reduction of CPU requirements. Speedup for lightweight games, slows down others. FMVs and audio may stutter or skip."); - } - case -1: - { - const wxColour Orange = wxColour(255, 120, 0); - m_msg_eeRate->SetForegroundColour(Orange); - return pxEt(L"75% cyclerate. Slight reduction of CPU requirements. Speedup for less demanding games, slows down others."); - } - case 0: - { - const wxColour DarkSeaGreen = wxColour(14, 158, 19); - m_msg_eeRate->SetForegroundColour(DarkSeaGreen); - return pxEt(L"Default cyclerate. Runs the emulated PS2 Emotion Engine at normal speed."); - } - case 1: - { - const wxColour Orange = wxColour(255, 120, 0); - m_msg_eeRate->SetForegroundColour(Orange); - return pxEt(L"130% cyclerate. Moderate increase of CPU requirements. Variable framerate games may have higher internal framerates."); - } - case 2: - { - const wxColour LightRed = wxColour(255, 80, 0); - m_msg_eeRate->SetForegroundColour(LightRed); - return pxEt(L"180% cyclerate. Significant increase of CPU requirements. Variable framerate games will have higher internal framerates. FMVs may be slow. May cause stability problems."); - } - case 3: - { - m_msg_eeRate->SetForegroundColour(wxColour(L"Red")); - return pxEt(L"300% cyclerate. Extreme increase of CPU requirements. Variable framerate games will have higher internal framerates. FMVs may be slow. May cause stability problems."); - } - default: - break; - } - - return L"Unreachable Warning Suppressor!!"; -} - -const wxChar* Panels::SpeedHacksPanel::GetEECycleSkipSliderMsg( int val ) -{ - switch( val ) - { - case 0: - { - const wxColour DarkSeaGreen = wxColour(14, 158, 19); - m_msg_eeSkip->SetForegroundColour(DarkSeaGreen); - return pxEt(L"Disables EE Cycle Skipping. Most compatible setting."); - } - case 1: - { - const wxColour Orange = wxColour(255, 120, 0); - m_msg_eeSkip->SetForegroundColour(Orange); - return pxEt(L"Mild EE Cycle Skipping. Mild slow down for most games, but may help some games with mild VU starvation problems run at full speed."); - } - case 2: - { - const wxColour LightRed = wxColour(255, 80, 0); - m_msg_eeSkip->SetForegroundColour(LightRed); - return pxEt(L"Moderate EE Cycle Skipping. Slow down for most games, but may help some games with moderate VU starvation problems run at full speed."); - } - default: - break; - } - - return L"Unreachable Warning Suppressor!!"; -} - -void Panels::SpeedHacksPanel::SetEEcycleSliderMsg() -{ - m_msg_eeRate->SetLabel( GetEECycleRateSliderMsg(m_slider_eeRate->GetValue()) ); -} - -void Panels::SpeedHacksPanel::SetVUcycleSliderMsg() -{ - m_msg_eeSkip->SetLabel( GetEECycleSkipSliderMsg(m_slider_eeSkip->GetValue()) ); -} - -Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) - : BaseApplicableConfigPanel_SpecificConfig( parent ) -{ - const wxSizerFlags sliderFlags( wxSizerFlags().Border( wxLEFT | wxRIGHT, 8 ).Expand() ); - - m_check_Enable = new pxCheckBox( - this, _("Enable speedhacks"), - pxE( L"Speedhacks usually improve emulation speed"", but can cause glitches, broken audio, and false FPS readings. When having emulation problems, disable this panel first." - ) - ); - m_check_Enable->SetToolTip(_("A safe and easy way to make sure that all speedhacks are completely disabled.")).SetSubPadding( 1 ); - - - m_button_Defaults = new wxButton( this, wxID_DEFAULT, _("Restore Defaults") ); - - // ------------------------------------------------------------------------ - // EE Cyclerate Hack Section: - - // Misc help text that I might find a home for later: - // Cycle stealing works by 'fast-forwarding' the EE by an arbitrary number of cycles whenever VU1 micro-programs - // are run, which works as a rough-guess skipping of what would normally be idle time spent running on the EE. - - m_eeRateSliderPanel = new wxPanelWithHelpers( this, wxVERTICAL, _("EE Cyclerate [Not Recommended]") ); - - m_slider_eeRate = new wxSlider( m_eeRateSliderPanel, wxID_ANY, 0, -3, 3, - wxDefaultPosition, wxDefaultSize, wxHORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS ); - - m_msg_eeRate = new pxStaticHeading( m_eeRateSliderPanel ); - const wxChar* eeRate_tooltip = pxEt( L"Modifies the emulated Emotion Engine CPU clock. Higher values may increase the internal framerate in games with variable framerates, but will increase CPU requirements substantially. Lower values will reduce the CPU load allowing lightweight games to run full speed on weaker CPUs." ); - pxSetToolTip( m_slider_eeRate, eeRate_tooltip ); - pxSetToolTip( m_msg_eeRate, eeRate_tooltip ); - - // ------------------------------------------------------------------------ - // EE Cycle Skipping Hack Section: - - m_eeSkipSliderPanel = new wxPanelWithHelpers( this, wxVERTICAL, _("EE Cycle Skipping [Not Recommended]") ); - - m_slider_eeSkip = new wxSlider(m_eeSkipSliderPanel, wxID_ANY, 0, 0, 2, wxDefaultPosition, wxDefaultSize, - wxHORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS ); - - m_msg_eeSkip = new pxStaticHeading(m_eeSkipSliderPanel); - - const wxChar* eeSkip_tooltip = pxEt( L"Makes the emulated Emotion Engine skip cycles, allowing VU microprograms to execute at faster intervals. Helps a small subset of games with VU starvation problems, E.g. Shadow of the Colossus. More often than not this is harmful to performance and causes FPS readouts to be inaccurate." ); - - pxSetToolTip( m_slider_eeSkip, eeSkip_tooltip ); - pxSetToolTip( m_msg_eeSkip, eeSkip_tooltip ); - - // ------------------------------------------------------------------------ - // microVU Hacks Section: - - wxPanelWithHelpers* vuHacksPanel = new wxPanelWithHelpers( this, wxVERTICAL, _("microVU Hacks") ); - - m_check_vuFlagHack = new pxCheckBox( vuHacksPanel, _("mVU Flag Hack"), - _("Good Speedup and High Compatibility; may cause bad graphics... [Recommended]" ) ); - - m_check_vuThread = new pxCheckBox( vuHacksPanel, _("MTVU (Multi-Threaded microVU1)"), - _("Good Speedup and High Compatibility; may cause hanging... [Recommended on 3+ cores]") ); - - m_check_vu1Instant = new pxCheckBox(vuHacksPanel, _("Instant VU1"), - _("Good Speedup and High Compatibility; may cause some graphical errors")); - - m_check_vuFlagHack->SetToolTip( pxEt( L"Updates Status Flags only on blocks which will read them, instead of all the time. This is safe most of the time." - ) ); - - m_check_vuThread->SetToolTip( pxEt( L"Runs VU1 on its own thread. Generally a speedup on CPUs with 3 or more cores. This is safe for most games, but a few games are incompatible and may hang. In the case of GS limited games, it may be a slowdown (especially on dual core CPUs)." - ) ); - - m_check_vu1Instant->SetToolTip(pxEt(L"Runs VU1 instantly. Provides a modest speed improvement in most games. This is safe for most games, but a few games may exhibit graphical errors." - )); - - // ------------------------------------------------------------------------ - // All other hacks Section: - - wxPanelWithHelpers* miscHacksPanel = new wxPanelWithHelpers( this, wxVERTICAL, _("Other Hacks") ); - - m_check_intc = new pxCheckBox( miscHacksPanel, _("Enable INTC Spin Detection"), - _("Huge speedup for some games, with almost no compatibility side effects. [Recommended]") ); - - m_check_waitloop = new pxCheckBox( miscHacksPanel, _("Enable Wait Loop Detection"), - _("Moderate speedup for some games, with no known side effects. [Recommended]" ) ); - - m_check_fastCDVD = new pxCheckBox( miscHacksPanel, _("Enable fast CDVD"), - _("Fast disc access, less loading times. [Not Recommended]") ); - - - m_check_intc->SetToolTip( pxEt( L"This hack works best for games that use the INTC Status register to wait for vsyncs, which includes primarily non-3D RPG titles. Games that do not use this method of vsync will see little or no speedup from this hack." - ) ); - - m_check_waitloop->SetToolTip( pxEt( L"Primarily targetting the EE idle loop at address 0x81FC0 in the kernel, this hack attempts to detect loops whose bodies are guaranteed to result in the same machine state for every iteration until a scheduled event triggers emulation of another unit. After a single iteration of such loops, we advance to the time of the next event or the end of the processor's timeslice, whichever comes first." - ) ); - - m_check_fastCDVD->SetToolTip( pxEt( L"Check HDLoader compatibility lists for known games that have issues with this (often marked as needing 'mode 1' or 'slow DVD')." - ) ); - - - *m_eeRateSliderPanel += m_slider_eeRate | sliderFlags; - *m_eeRateSliderPanel += m_msg_eeRate | sliderFlags; - - *m_eeSkipSliderPanel += m_slider_eeSkip | sliderFlags; - *m_eeSkipSliderPanel += m_msg_eeSkip | sliderFlags; - - *vuHacksPanel += m_check_vuFlagHack | StdExpand(); - *vuHacksPanel += m_check_vuThread | StdExpand(); - *vuHacksPanel += m_check_vu1Instant | StdExpand(); - - *miscHacksPanel += m_check_intc | StdExpand(); - *miscHacksPanel += m_check_waitloop | StdExpand(); - *miscHacksPanel += m_check_fastCDVD | StdExpand(); - - s_table = new wxFlexGridSizer( 3, 2, 0, 0 ); - s_table->Add(m_eeRateSliderPanel, StdExpand()); - s_table->Add(m_eeSkipSliderPanel, StdExpand()); - s_table->Add(miscHacksPanel, StdExpand()); - s_table->Add(vuHacksPanel, StdExpand()); - s_table->Add(new wxStaticText(this, -1, "")); - s_table->Add(m_button_Defaults, StdButton()); - - m_sizer = new wxBoxSizer(wxVERTICAL); - m_sizer->Add(m_check_Enable, StdExpand()); - m_sizer->Add(s_table); - - SetSizer(m_sizer); - // ------------------------------------------------------------------------ - - Bind(wxEVT_SCROLL_CHANGED, &SpeedHacksPanel::EECycleRate_Scroll, this, m_slider_eeRate->GetId()); - Bind(wxEVT_SCROLL_CHANGED, &SpeedHacksPanel::VUCycleRate_Scroll, this, m_slider_eeSkip->GetId()); - Bind(wxEVT_CHECKBOX, &SpeedHacksPanel::OnEnable_Toggled, this, m_check_Enable->GetId()); - Bind(wxEVT_BUTTON, &SpeedHacksPanel::Defaults_Click, this, wxID_DEFAULT); -} - -// Doesn't modify values - only locks(gray out)/unlocks as necessary. -void Panels::SpeedHacksPanel::EnableStuff( AppConfig* configToUse ) -{ - if (!configToUse) configToUse = g_Conf.get(); - - bool hasPreset = configToUse->EnablePresets; - bool hacksEnabled = configToUse->EnableSpeedHacks; - bool HacksEnabledAndNoPreset = hacksEnabled && !hasPreset; - - // Main checkbox and Restore-defaults - locked only if presets are enabled - m_check_Enable->Enable(!hasPreset); - m_button_Defaults->Enable(!hasPreset); - - // lock/unlock the slider panels rather than the sliders themselves - // in order to affect both sliders and texts - m_eeRateSliderPanel->Enable(HacksEnabledAndNoPreset); - m_eeSkipSliderPanel->Enable(HacksEnabledAndNoPreset); - - // checkboxes - m_check_vuFlagHack->Enable(HacksEnabledAndNoPreset); - m_check_intc->Enable(HacksEnabledAndNoPreset); - m_check_waitloop->Enable(HacksEnabledAndNoPreset); - m_check_fastCDVD->Enable(HacksEnabledAndNoPreset); - - // Grayout MTVU on safest preset - m_check_vuThread->Enable(hacksEnabled && (!hasPreset || configToUse->PresetIndex != 0)); - - // Layout necessary to ensure changed slider text gets re-aligned properly - // and to properly gray/ungray pxStaticText stuff (I suspect it causes a - // paint event to be sent on Windows) - Layout(); -} - -void Panels::SpeedHacksPanel::AppStatusEvent_OnSettingsApplied() -{ - //Console.WriteLn("SpeedHacksPanel::AppStatusEvent_OnSettingsApplied()"); - ApplyConfigToGui( *g_Conf ); -} - -void Panels::SpeedHacksPanel::ApplyConfigToGui( AppConfig& configToApply, int flags ) -{ - Pcsx2Config::SpeedhackOptions& opts=configToApply.EmuOptions.Speedhacks; - - // First, set the values of the widgets (checked/unchecked etc). - m_check_Enable->SetValue(configToApply.EnableSpeedHacks); - - m_slider_eeRate ->SetValue( opts.EECycleRate ); - - opts.EECycleSkip = std::clamp(opts.EECycleSkip, 0, 2); - m_slider_eeSkip ->SetValue( opts.EECycleSkip ); - - SetEEcycleSliderMsg(); - SetVUcycleSliderMsg(); - - m_check_vuFlagHack->SetValue(opts.vuFlagHack); - m_check_intc->SetValue(opts.IntcStat); - m_check_waitloop->SetValue(opts.WaitLoop); - m_check_fastCDVD->SetValue(opts.fastCDVD); - m_check_vuThread->SetValue(opts.vuThread); - m_check_vu1Instant->SetValue(opts.vu1Instant); - - // Then, lock(gray out)/unlock the widgets as necessary. - EnableStuff( &configToApply ); -} - -// Apply the values from the widgets to the config, -// regardless if locked (grayed out) or not. -void Panels::SpeedHacksPanel::Apply() -{ - g_Conf->EnableSpeedHacks = m_check_Enable->GetValue(); - - Pcsx2Config::SpeedhackOptions& opts( g_Conf->EmuOptions.Speedhacks ); - - opts.EECycleRate = m_slider_eeRate->GetValue(); - opts.EECycleSkip = m_slider_eeSkip->GetValue(); - - opts.WaitLoop = m_check_waitloop->GetValue(); - opts.fastCDVD = m_check_fastCDVD->GetValue(); - opts.IntcStat = m_check_intc->GetValue(); - opts.vuFlagHack = m_check_vuFlagHack->GetValue(); - opts.vuThread = m_check_vuThread->GetValue(); - opts.vu1Instant = m_check_vu1Instant->GetValue(); - - // If the user has a command line override specified, we need to disable it - // so that their changes take effect - wxGetApp().Overrides.DisableSpeedhacks = false; -} - -void Panels::SpeedHacksPanel::OnEnable_Toggled( wxCommandEvent& evt ) -{ - AppConfig tmp=*g_Conf; - tmp.EnablePresets=false; //if clicked, button was enabled, so not using a preset --> let EnableStuff work - tmp.EnableSpeedHacks = m_check_Enable->GetValue(); - - EnableStuff( &tmp ); - evt.Skip(); -} - -void Panels::SpeedHacksPanel::Defaults_Click( wxCommandEvent& evt ) -{ - //Can only get here presets are disabled at the GUI (= the 'Defaults' button is enabled). - AppConfig currentConfigWithHacksReset = *g_Conf; - currentConfigWithHacksReset.EmuOptions.Speedhacks = Pcsx2Config::SpeedhackOptions(); - currentConfigWithHacksReset.EnablePresets=false;//speed hacks gui depends on preset, apply it as if presets are disabled - ApplyConfigToGui( currentConfigWithHacksReset ); - evt.Skip(); -} - -void Panels::SpeedHacksPanel::EECycleRate_Scroll(wxScrollEvent &event) -{ - SetEEcycleSliderMsg(); - - Layout(); - - event.Skip(); -} - -void Panels::SpeedHacksPanel::VUCycleRate_Scroll(wxScrollEvent &event) -{ - SetVUcycleSliderMsg(); - - Layout(); - - event.Skip(); -} diff --git a/pcsx2/gui/Panels/VideoPanel.cpp b/pcsx2/gui/Panels/VideoPanel.cpp deleted file mode 100644 index f241b9e3cd..0000000000 --- a/pcsx2/gui/Panels/VideoPanel.cpp +++ /dev/null @@ -1,267 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/App.h" -#include "gui/AppAccelerators.h" -#include "gui/Dialogs/ConfigurationDialog.h" -#include "ConfigurationPanels.h" - -#include -#include "fmt/core.h" - -using namespace pxSizerFlags; - -// -------------------------------------------------------------------------------------- -// FramelimiterPanel Implementations -// -------------------------------------------------------------------------------------- - -Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent ) - : BaseApplicableConfigPanel_SpecificConfig( parent ) -{ - // Implement custom hotkeys (F4) with translatable string intact + not blank in GUI. - m_check_LimiterDisable = new pxCheckBox( this, _("Disable Framelimiting") + wxString(" (") + wxGetApp().GlobalAccels->findKeycodeWithCommandId("Framelimiter_MasterToggle").toTitleizedString()+ wxString(")"), - _("Uncaps FPS. Useful for running benchmarks.") ); - - m_check_LimiterDisable->SetToolTip( pxEt( L"Note that when Framelimiting is disabled, Turbo and SlowMotion modes will not be available either." - ) ); - - m_spin_NominalPct = new wxSpinCtrl(this); - m_spin_SlomoPct = new wxSpinCtrl(this); - m_spin_TurboPct = new wxSpinCtrl(this); - - m_text_BaseNtsc = CreateNumericalTextCtrl( this, 7 ); - m_text_BasePal = CreateNumericalTextCtrl( this, 7 ); - - m_spin_NominalPct ->SetRange( 10, 1000 ); - m_spin_SlomoPct ->SetRange( 5, 1000 ); - m_spin_TurboPct ->SetRange( 10, 1000 ); - - // ------------------------------------------------------------ - // Sizers and Layouts - - *this += m_check_LimiterDisable | StdExpand(); - - wxFlexGridSizer& s_spins( *new wxFlexGridSizer( 5 ) ); - s_spins.AddGrowableCol( 0 ); - - s_spins += Label(_("Base Framerate Adjust:")) | StdExpand(); - s_spins += 5; - s_spins += m_spin_NominalPct | pxBorder(wxTOP, 3); - s_spins += Label(L"%") | StdExpand(); - s_spins += 5; - - // Implement custom hotkeys (Shift + Tab) with translatable string intact + not blank in GUI. - - s_spins += Label(_("Slow Motion Adjust:") + wxString::Format(" (%s)", wxGetApp().GlobalAccels->findKeycodeWithCommandId("Framelimiter_SlomoToggle").toTitleizedString())) | StdExpand(); - s_spins += 5; - s_spins += m_spin_SlomoPct | pxBorder(wxTOP, 3); - s_spins += Label(L"%") | StdExpand(); - s_spins += 5; - - // Implement custom hotkeys (Tab) with translatable string intact + not blank in GUI. - - s_spins += Label(_("Turbo Adjust:") + wxString::Format(" (%s)", wxGetApp().GlobalAccels->findKeycodeWithCommandId("Framelimiter_TurboToggle").toTitleizedString())) | StdExpand(); - s_spins += 5; - s_spins += m_spin_TurboPct | pxBorder(wxTOP, 3); - s_spins += Label(L"%") | StdExpand(); - s_spins += 5; - - wxFlexGridSizer& s_fps( *new wxFlexGridSizer( 5 ) ); - s_fps.AddGrowableCol( 0 ); - - s_fps += Label(_("NTSC Framerate:")) | StdExpand(); - s_fps += 5; - s_fps += m_text_BaseNtsc | pxBorder(wxTOP, 2).Right(); - s_fps += Label(_("FPS")) | StdExpand(); - s_fps += 5; - - s_fps += Label(_("PAL Framerate:")) | StdExpand(); - s_fps += 5; - s_fps += m_text_BasePal | pxBorder(wxTOP, 2).Right(); - s_fps += Label(_("FPS")) | StdExpand(); - s_fps += 5; - - *this += s_spins | pxExpand; - *this += 5; - *this += s_fps | pxExpand; - - AppStatusEvent_OnSettingsApplied(); -} - -void Panels::FramelimiterPanel::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui( *g_Conf ); -} - -void Panels::FramelimiterPanel::ApplyConfigToGui( AppConfig& configToApply, int flags ) -{ - const Pcsx2Config::FramerateOptions& appfps( configToApply.EmuOptions.Framerate ); - const Pcsx2Config::GSOptions& gsconf( configToApply.EmuOptions.GS ); - - if( ! (flags & AppConfig::APPLY_FLAG_FROM_PRESET) ) - { //Presets don't control these: only change if config doesn't come from preset. - - m_check_LimiterDisable->SetValue(!gsconf.FrameLimitEnable); - - m_spin_TurboPct->SetValue(appfps.TurboScalar * 100.0); - m_spin_SlomoPct->SetValue(appfps.SlomoScalar * 100.0); - - m_spin_TurboPct->Enable(true); - m_spin_SlomoPct->Enable(true); - } - - m_text_BaseNtsc->ChangeValue(wxString::FromDouble(gsconf.FramerateNTSC, 2)); - m_text_BasePal->ChangeValue(wxString::FromDouble(gsconf.FrameratePAL, 2)); - - m_spin_NominalPct->SetValue(appfps.NominalScalar * 100.0); - m_spin_NominalPct->Enable(!configToApply.EnablePresets); - - m_text_BaseNtsc->Enable(!configToApply.EnablePresets); - m_text_BasePal->Enable(!configToApply.EnablePresets); -} - -void Panels::FramelimiterPanel::Apply() -{ - Pcsx2Config::FramerateOptions& appfps( g_Conf->EmuOptions.Framerate ); - Pcsx2Config::GSOptions& gsconf( g_Conf->EmuOptions.GS ); - - gsconf.FrameLimitEnable = !m_check_LimiterDisable->GetValue(); - - appfps.NominalScalar = static_cast(m_spin_NominalPct->GetValue()) / 100.0; - appfps.TurboScalar = static_cast(m_spin_TurboPct->GetValue()) / 100.0; - appfps.SlomoScalar = static_cast(m_spin_SlomoPct->GetValue()) / 100.0; - - wxString ntsc_framerate_string = m_text_BaseNtsc->GetValue(); - wxString pal_framerate_string = m_text_BasePal->GetValue(); - - double framerate = 0.0; - - if (ntsc_framerate_string.ToDouble(&framerate)) - gsconf.FramerateNTSC = framerate; - - if (pal_framerate_string.ToDouble(&framerate)) - gsconf.FrameratePAL = framerate; - - appfps.SanityCheck(); - - // If the user has a command line override specified, we need to disable it - // so that their changes take effect - wxGetApp().Overrides.ProfilingMode = false; -} - -// -------------------------------------------------------------------------------------- -// VideoPanel Implementation -// -------------------------------------------------------------------------------------- - -Panels::VideoPanel::VideoPanel( wxWindow* parent ) : - BaseApplicableConfigPanel_SpecificConfig( parent ) -{ - wxPanelWithHelpers* left = new wxPanelWithHelpers( this, wxVERTICAL ); -#ifdef PCSX2_DEVBUILD - m_check_SynchronousGS = new pxCheckBox( left, _("Use Synchronized MTGS"), - _t("For troubleshooting potential bugs in the MTGS only, as it is potentially very slow.") - ); -#endif - - m_spinner_VsyncQueue = new wxSpinCtrl(left); - m_spinner_VsyncQueue->SetRange(0, 3); - - m_restore_defaults = new wxButton(this, wxID_DEFAULT, _("Restore Defaults")); - - m_spinner_VsyncQueue->SetToolTip( pxEt(L"Setting this to a lower value improves input lag, a value around 2 or 3 will slightly improve framerates. (Default is 2)")); -#ifdef PCSX2_DEVBUILD - m_check_SynchronousGS->SetToolTip( pxEt( L"Enable this if you think MTGS thread sync is causing crashes or graphical errors. For debugging to see if GS is running at the correct speed.")); -#endif - - //GSWindowSettingsPanel* winpan = new GSWindowSettingsPanel( left ); - //winpan->AddFrame(_("Display/Window")); - - m_fpan = new FramelimiterPanel( left ); - m_fpan->AddFrame(_("Framelimiter")); - - wxFlexGridSizer* s_table = new wxFlexGridSizer( 2 ); - wxGridSizer* s_vsyncs = new wxGridSizer( 2 ); - s_table->AddGrowableCol( 0, 1 ); - s_table->AddGrowableCol( 1, 1 ); - - *left += m_fpan | pxExpand; - *left += 5; - - *s_vsyncs += left->Label(_("Vsyncs in MTGS Queue:")) | StdExpand(); - *s_vsyncs += m_spinner_VsyncQueue | pxBorder(wxTOP, -2).Right(); - *left += s_vsyncs | StdExpand(); -#ifdef PCSX2_DEVBUILD - *left += 2; - *left += m_check_SynchronousGS | StdExpand(); -#endif - - *s_table += left | StdExpand(); - - *this += s_table | pxExpand; - - *this += 12; - *this += m_restore_defaults | StdButton(); - - Bind(wxEVT_BUTTON, &VideoPanel::Defaults_Click, this, wxID_DEFAULT); - AppStatusEvent_OnSettingsApplied(); -} - -void Panels::VideoPanel::Defaults_Click(wxCommandEvent& evt) -{ - AppConfig config = *g_Conf; - config.EmuOptions.GS = Pcsx2Config::GSOptions(); - config.EmuOptions.Framerate = Pcsx2Config::FramerateOptions(); - VideoPanel::ApplyConfigToGui(config); - m_fpan->ApplyConfigToGui(config); - evt.Skip(); -} - -void Panels::VideoPanel::OnOpenWindowSettings( wxCommandEvent& evt ) -{ - AppOpenDialog( this ); - - // don't evt.skip, this prevents the Apply button from being activated. :) -} - -void Panels::VideoPanel::Apply() -{ -#ifdef PCSX2_DEVBUILD - g_Conf->EmuOptions.GS.SynchronousMTGS = m_check_SynchronousGS->GetValue(); -#endif - g_Conf->EmuOptions.GS.VsyncQueueSize = m_spinner_VsyncQueue->GetValue(); -} - -void Panels::VideoPanel::AppStatusEvent_OnSettingsApplied() -{ - ApplyConfigToGui(*g_Conf); -} - -void Panels::VideoPanel::ApplyConfigToGui( AppConfig& configToApply, int flags ){ - -#ifdef PCSX2_DEVBUILD - m_check_SynchronousGS->SetValue( configToApply.EmuOptions.GS.SynchronousMTGS ); - m_check_SynchronousGS->Enable(!configToApply.EnablePresets); -#endif - m_spinner_VsyncQueue->SetValue( configToApply.EmuOptions.GS.VsyncQueueSize ); - - if( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ) - { - m_fpan->ApplyConfigToGui( configToApply, true ); - } - - Layout(); -} - diff --git a/pcsx2/gui/PathDefs.h b/pcsx2/gui/PathDefs.h deleted file mode 100644 index 7502fb81c2..0000000000 --- a/pcsx2/gui/PathDefs.h +++ /dev/null @@ -1,95 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2009 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "wxDirName.h" - -enum FoldersEnum_t -{ - // FIXME : Settings folder is no longer part of the user-local - // ini storage. They have been moved to an app-local ini storage class (which is currently - // handled lazily via global variables) - FolderId_Settings = 0, - - FolderId_Bios, - FolderId_Snapshots, - FolderId_Savestates, - FolderId_MemoryCards, - FolderId_Logs, - FolderId_Langs, - - FolderId_Documents, - - FolderId_Cheats, - FolderId_CheatsWS, - FolderId_Cache, - FolderId_Textures, - - FolderId_COUNT -}; - -// -------------------------------------------------------------------------------------- -// PathDefs (namespace) -// -------------------------------------------------------------------------------------- -// Contains default values for various pcsx2 path names and locations. -// -// Note: The members of this namespace are intended for default value initialization only. -// Everything else should use the path folder assignments in g_Conf instead, since those -// are user-configurable. -// -namespace PathDefs -{ - // complete pathnames are returned by these functions (may or may not be absolute) - - extern wxDirName GetSnapshots(); - extern wxDirName GetBios(); - extern wxDirName GetSavestates(); - extern wxDirName GetMemoryCards(); - extern wxDirName GetSettings(); - extern wxDirName GetLogs(); - extern wxDirName GetLangs(); - extern wxDirName GetCheats(); - extern wxDirName GetCheatsWS(); - extern wxDirName GetDocs(); - - extern wxDirName Get( FoldersEnum_t folderidx ); - - // Base folder names used to extend out the documents/approot folder base into a complete - // path. These are typically for internal AppConfig use only, barring a few special cases. - namespace Base - { - extern const wxDirName& Snapshots(); - extern const wxDirName& Savestates(); - extern const wxDirName& MemoryCards(); - extern const wxDirName& Settings(); - extern const wxDirName& Logs(); - extern const wxDirName& Dumps(); - extern const wxDirName& Langs(); - extern const wxDirName& Cheats(); - extern const wxDirName& CheatsWS(); - extern const wxDirName& Docs(); - } -} - -namespace FilenameDefs -{ - extern wxFileName GetUiConfig(); - extern wxFileName GetUiKeysConfig(); - extern wxFileName GetVmConfig(); - extern wxFileName GetUsermodeConfig(); - extern const wxFileName& Memcard( uint port, uint slot ); -}; - diff --git a/pcsx2/gui/PathUtils.cpp b/pcsx2/gui/PathUtils.cpp deleted file mode 100644 index dedddeb40a..0000000000 --- a/pcsx2/gui/PathUtils.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "common/Path.h" -#include "common/Assertions.h" -#include "common/Exceptions.h" -#include "gui/PersistentThread.h" -#include "wxDirName.h" - -#include -#include - -// --------------------------------------------------------------------------------- -// wxDirName (implementations) -// --------------------------------------------------------------------------------- - -wxFileName wxDirName::Combine(const wxFileName& right) const -{ - pxAssertMsg(IsDir(), "Warning: Malformed directory name detected during wxDirName concatenation."); - if (right.IsAbsolute()) - return right; - - // Append any directory parts from right, and then set the filename. - // Except we can't do that because our m_members are private (argh!) and there is no API - // for getting each component of the path. So instead let's use Normalize: - - wxFileName result(right); - result.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE, GetPath()); - return result; -} - -wxDirName wxDirName::Combine(const wxDirName& right) const -{ - pxAssertMsg(IsDir() && right.IsDir(), "Warning: Malformed directory name detected during wDirName concatenation."); - - wxDirName result(right); - result.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE, GetPath()); - return result; -} - -wxDirName& wxDirName::Normalize(int flags, const wxString& cwd) -{ - pxAssertMsg(IsDir(), "Warning: Malformed directory name detected during wDirName normalization."); - if (!wxFileName::Normalize(flags, cwd)) - throw Exception::ParseError().SetDiagMsg("wxDirName::Normalize operation failed."); - return *this; -} - -wxDirName& wxDirName::MakeRelativeTo(const wxString& pathBase) -{ - pxAssertMsg(IsDir(), "Warning: Malformed directory name detected during wDirName normalization."); - if (!wxFileName::MakeRelativeTo(pathBase)) - throw Exception::ParseError().SetDiagMsg("wxDirName::MakeRelativeTo operation failed."); - return *this; -} - -wxDirName& wxDirName::MakeAbsolute(const wxString& cwd) -{ - pxAssertMsg(IsDir(), "Warning: Malformed directory name detected during wDirName normalization."); - if (!wxFileName::MakeAbsolute(cwd)) - throw Exception::ParseError().SetDiagMsg("wxDirName::MakeAbsolute operation failed."); - return *this; -} - -void wxDirName::Rmdir() const -{ - if (!Exists()) - return; - wxFileName::Rmdir(); - // TODO : Throw exception if operation failed? Do we care? -} - -bool wxDirName::Mkdir() const -{ -// wxWidgets recurses directory creation for us. - -// only exist in wx2.9 and above -#ifndef wxS_DIR_DEFAULT -#define wxS_DIR_DEFAULT 0777 -#endif - - if (Exists()) - return true; - return wxFileName::Mkdir(wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL); -} - - -// --------------------------------------------------------------------------------- -// Path namespace (wxFileName helpers) -// --------------------------------------------------------------------------------- - - -bool Path::IsRelative(const wxString& path) -{ - return wxDirName(path).IsRelative(); -} - -// Returns -1 if the file does not exist. -s64 Path::GetFileSize(const wxString& path) -{ - if (!wxFile::Exists(path.c_str())) - return -1; - return (s64)wxFileName::GetSize(path).GetValue(); -} - - -wxString Path::Normalize(const wxString& src) -{ - wxFileName normalize(src); - normalize.Normalize(); - return normalize.GetFullPath(); -} - -wxString Path::Normalize(const wxDirName& src) -{ - return wxDirName(src).Normalize().ToString(); -} - -wxString Path::MakeAbsolute(const wxString& src) -{ - wxFileName absolute(src); - absolute.MakeAbsolute(); - return absolute.GetFullPath(); -} - -// Concatenates two pathnames together, inserting delimiters (backslash on win32) -// as needed! Assumes the 'dest' is allocated to at least g_MaxPath length. -// -wxString Path::CombineWx(const wxString& srcPath, const wxString& srcFile) -{ - return (wxDirName(srcPath) + srcFile).GetFullPath(); -} - -wxString Path::CombineWx(const wxDirName& srcPath, const wxFileName& srcFile) -{ - return (srcPath + srcFile).GetFullPath(); -} - -wxString Path::CombineWx(const wxString& srcPath, const wxDirName& srcFile) -{ - return (wxDirName(srcPath) + srcFile).ToString(); -} - -wxString Path::ReplaceFilename(const wxString& src, const wxString& newfilename) -{ - wxFileName jojo(src); - jojo.SetFullName(newfilename); - return jojo.GetFullPath(); -} - -wxString Path::GetFilename(const wxString& src) -{ - return wxFileName(src).GetFullName(); -} - -wxString Path::GetFilenameWithoutExt(const wxString& src) -{ - return wxFileName(src).GetName(); -} - -wxString Path::GetDirectory(const wxString& src) -{ - return wxFileName(src).GetPath(); -} - -// returns the base/root directory of the given path. -// Example /this/that/something.txt -> dest == "/" -wxString Path::GetRootDirectory(const wxString& src) -{ - size_t pos = src.find_first_of(wxFileName::GetPathSeparators()); - if (pos == wxString::npos) - return wxString(); - else - return wxString(src.begin(), src.begin() + pos); -} diff --git a/pcsx2/gui/PersistentThread.cpp b/pcsx2/gui/PersistentThread.cpp deleted file mode 100644 index 5c1e1b66fe..0000000000 --- a/pcsx2/gui/PersistentThread.cpp +++ /dev/null @@ -1,1198 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#ifdef __linux__ -#include // for pthread_kill, which is in pthread.h on w32-pthreads -#endif - -#if defined(__APPLE__) -#include -#include // semaphore_create() and semaphore_destroy() -#include // semaphore_*() -#include // mach_error_string() -#include // mach_absolute_time() -#include -#endif - -#include "PersistentThread.h" -#include "common/EventSource.inl" -#include "common/General.h" -#include - -using namespace Threading; - -template class EventSource; - -// 100ms interval for waitgui (issued from blocking semaphore waits on the main thread, -// to avoid gui deadlock). -const wxTimeSpan Threading::def_yieldgui_interval(0, 0, 0, 100); - -ConsoleLogSource_Threading::ConsoleLogSource_Threading() -{ - static const TraceLogDescriptor myDesc = - { - "p&xThread", "pxThread", - "Threading activity: start, detach, sync, deletion, etc."}; - - m_Descriptor = &myDesc; -} - -ConsoleLogSource_Threading pxConLog_Thread; - - -class StaticMutex : public Mutex -{ -protected: - bool& m_DeletedFlag; - -public: - StaticMutex(bool& deletedFlag) - : m_DeletedFlag(deletedFlag) - { - } - - virtual ~StaticMutex() - { - m_DeletedFlag = true; - } -}; - -static pthread_key_t curthread_key = 0; -static s32 total_key_count = 0; - -static bool tkl_destructed = false; -static StaticMutex total_key_lock(tkl_destructed); - -static void make_curthread_key(const pxThread* thr) -{ - pxAssumeDev(!tkl_destructed, "total_key_lock is destroyed; program is shutting down; cannot create new thread key."); - - ScopedLock lock(total_key_lock); - if (total_key_count++ != 0) - return; - - if (0 != pthread_key_create(&curthread_key, NULL)) - { - pxThreadLog.Error(thr->GetName(), L"Thread key creation failed (probably out of memory >_<)"); - curthread_key = 0; - } -} - -static void unmake_curthread_key() -{ - ScopedLock lock; - if (!tkl_destructed) - lock.AssignAndLock(total_key_lock); - - if (--total_key_count > 0) - return; - - if (curthread_key) - pthread_key_delete(curthread_key); - - curthread_key = 0; -} - -// make life easier for people using VC++ IDE by using this format, which allows double-click -// response times from the Output window... -std::string DiagnosticOrigin::ToString(const char* msg) const -{ - std::string message; - - fmt::format_to(std::back_inserter(message), "{}({}) : assertion failed:\n", srcfile, line); - - if (function) - fmt::format_to(std::back_inserter(message), " Function: {}\n", function); - - if (condition) - fmt::format_to(std::back_inserter(message), " Condition: {}\n", condition); - - if (msg) - fmt::format_to(std::back_inserter(message), " Message: {}\n", msg); - - return message; -} - -void Threading::pxTestCancel() -{ - pthread_testcancel(); -} - -// Returns a handle to the current persistent thread. If the current thread does not belong -// to the pxThread table, NULL is returned. Since the main/ui thread is not created -// through pxThread it will also return NULL. Callers can use wxThread::IsMain() to -// test if the NULL thread is the main thread. -pxThread* Threading::pxGetCurrentThread() -{ - return !curthread_key ? NULL : (pxThread*)pthread_getspecific(curthread_key); -} - -// returns the name of the current thread, or "Unknown" if the thread is neither a pxThread -// nor the Main/UI thread. -wxString Threading::pxGetCurrentThreadName() -{ - if (pxThread* thr = pxGetCurrentThread()) - { - return thr->GetName(); - } - else if (wxThread::IsMain()) - { - return L"Main/UI"; - } - - return L"Unknown"; -} - -// (intended for internal use only) -// Returns true if the Wait is recursive, or false if the Wait is safe and should be -// handled via normal yielding methods. -bool Threading::_WaitGui_RecursionGuard(const wxChar* name) -{ - AffinityAssert_AllowFrom_MainUI(); - - // In order to avoid deadlock we need to make sure we cut some time to handle messages. - // But this can result in recursive yield calls, which would crash the app. Protect - // against them here and, if recursion is detected, perform a standard blocking wait. - - static int __Guard = 0; - RecursionGuard guard(__Guard); - - //if( pxAssertDev( !guard.IsReentrant(), "Recursion during UI-bound threading wait object." ) ) return false; - - if (!guard.IsReentrant()) - return false; - pxThreadLog.Write(pxGetCurrentThreadName(), - pxsFmt(L"Yield recursion in %s; opening modal dialog.", name)); - return true; -} - -void Threading::pxThread::_pt_callback_cleanup(void* handle) -{ - ((pxThread*)handle)->_ThreadCleanup(); -} - -Threading::pxThread::pxThread(const wxString& name) - : m_name(name) - , m_thread() - , m_detached(true) // start out with m_thread in detached/invalid state - , m_running(false) -{ -} - -// This destructor performs basic "last chance" cleanup, which is a blocking join -// against the thread. Extending classes should almost always implement their own -// thread closure process, since any pxThread will, by design, not terminate -// unless it has been properly canceled (resulting in deadlock). -// -// Thread safety: This class must not be deleted from its own thread. That would be -// like marrying your sister, and then cheating on her with your daughter. -Threading::pxThread::~pxThread() -{ - try - { - pxThreadLog.Write(GetName(), L"Executing default destructor!"); - - if (m_running) - { - pxThreadLog.Write(GetName(), L"Waiting for running thread to end..."); - m_mtx_InThread.Wait(); - pxThreadLog.Write(GetName(), L"Thread ended gracefully."); - } - Threading::Sleep(1); - Detach(); - } - DESTRUCTOR_CATCHALL -} - -bool Threading::pxThread::AffinityAssert_AllowFromSelf(const DiagnosticOrigin& origin) const -{ - if (IsSelf()) - return true; - - if (IsDevBuild) - pxOnAssertFail(origin.srcfile, origin.line, origin.function, pxsFmt(L"Thread affinity violation: Call allowed from '%s' thread only.", WX_STR(GetName())).ToUTF8().data()); - - return false; -} - -bool Threading::pxThread::AffinityAssert_DisallowFromSelf(const DiagnosticOrigin& origin) const -{ - if (!IsSelf()) - return true; - - if (IsDevBuild) - pxOnAssertFail(origin.srcfile, origin.line, origin.function, pxsFmt(L"Thread affinity violation: Call is *not* allowed from '%s' thread.", WX_STR(GetName())).ToUTF8().data()); - - return false; -} - -void Threading::pxThread::FrankenMutex(Mutex& mutex) -{ - if (mutex.RecreateIfLocked()) - { - // Our lock is bupkis, which means the previous thread probably deadlocked. - // Let's create a new mutex lock to replace it. - - pxThreadLog.Error(GetName(), L"Possible deadlock detected on restarted mutex!"); - } -} - -// Main entry point for starting or e-starting a persistent thread. This function performs necessary -// locks and checks for avoiding race conditions, and then calls OnStart() immediately before -// the actual thread creation. Extending classes should generally not override Start(), and should -// instead override DoPrepStart instead. -// -// This function should not be called from the owner thread. -void Threading::pxThread::Start() -{ - // Prevents sudden parallel startup, and or parallel startup + cancel: - ScopedLock startlock(m_mtx_start); - if (m_running) - { - pxThreadLog.Write(GetName(), L"Start() called on running thread; ignorning..."); - return; - } - - Detach(); // clean up previous thread handle, if one exists. - OnStart(); - - m_except = NULL; - - pxThreadLog.Write(GetName(), L"Calling pthread_create..."); - if (pthread_create(&m_thread, NULL, _internal_callback, this) != 0) - throw Exception::ThreadCreationError(this).SetDiagMsg(StringUtil::StdStringFromFormat("Thread creation error: %s" , std::strerror(errno))); - -#ifdef ASAN_WORKAROUND - // Recent Asan + libc6 do pretty bad stuff on the thread init => https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77982 - // - // In our case, the semaphore was posted (counter is 1) but thread is still - // waiting... So waits 100ms and checks the counter value manually - if (!m_sem_startup.WaitWithoutYield(wxTimeSpan(0, 0, 0, 100))) - { - if (m_sem_startup.Count() == 0) - throw Exception::ThreadCreationError(this).SetDiagMsg("Thread creation error: %s thread never posted startup semaphore."); - } -#else - if (!m_sem_startup.WaitWithoutYield(wxTimeSpan(0, 0, 3, 0))) - { - RethrowException(); - - // And if the thread threw nothing of its own: - throw Exception::ThreadCreationError(this).SetDiagMsg("Thread creation error: %s thread never posted startup semaphore."); - } -#endif - - // Event Rationale (above): Performing this semaphore wait on the created thread is "slow" in the - // sense that it stalls the calling thread completely until the new thread is created - // (which may not always be desirable). But too bad. In order to safely use 'running' locks - // and detachment management, this *has* to be done. By rule, starting new threads shouldn't - // be done very often anyway, hence the concept of Threadpooling for rapidly rotating tasks. - // (and indeed, this semaphore wait might, in fact, be very swift compared to other kernel - // overhead in starting threads). - - // (this could also be done using operating system specific calls, since any threaded OS has - // functions that allow us to see if a thread is running or not, and to block against it even if - // it's been detached -- removing the need for m_mtx_InThread and the semaphore wait above. But - // pthreads kinda lacks that stuff, since pthread_join() has no timeout option making it im- - // possible to safely block against a running thread) -} - -// Returns: TRUE if the detachment was performed, or FALSE if the thread was -// already detached or isn't running at all. -// This function should not be called from the owner thread. -bool Threading::pxThread::Detach() -{ - AffinityAssert_DisallowFromSelf(pxDiagSpot); - - if (m_detached.exchange(true)) - return false; - pthread_detach(m_thread); - return true; -} - -bool Threading::pxThread::_basecancel() -{ - if (!m_running) - return false; - - if (m_detached) - { - pxThreadLog.Warn(GetName(), L"Ignoring attempted cancellation of detached thread."); - return false; - } - - pthread_cancel(m_thread); - return true; -} - -// Remarks: -// Provision of non-blocking Cancel() is probably academic, since destroying a pxThread -// object performs a blocking Cancel regardless of if you explicitly do a non-blocking Cancel() -// prior, since the ExecuteTaskInThread() method requires a valid object state. If you really need -// fire-and-forget behavior on threads, use pthreads directly for now. -// -// This function should not be called from the owner thread. -// -// Parameters: -// isBlocking - indicates if the Cancel action should block for thread completion or not. -// -// Exceptions raised by the blocking thread will be re-thrown into the main thread. If isBlocking -// is false then no exceptions will occur. -// -void Threading::pxThread::Cancel(bool isBlocking) -{ - AffinityAssert_DisallowFromSelf(pxDiagSpot); - - // Prevent simultaneous startup and cancel, necessary to avoid - ScopedLock startlock(m_mtx_start); - - if (!_basecancel()) - return; - - if (isBlocking) - { - WaitOnSelf(m_mtx_InThread); - Detach(); - } -} - -bool Threading::pxThread::Cancel(const wxTimeSpan& timespan) -{ - AffinityAssert_DisallowFromSelf(pxDiagSpot); - - // Prevent simultaneous startup and cancel: - ScopedLock startlock(m_mtx_start); - - if (!_basecancel()) - return true; - - if (!WaitOnSelf(m_mtx_InThread, timespan)) - return false; - Detach(); - return true; -} - - -// Blocks execution of the calling thread until this thread completes its task. The -// caller should make sure to signal the thread to exit, or else blocking may deadlock the -// calling thread. Classes which extend pxThread should override this method -// and signal any necessary thread exit variables prior to blocking. -// -// Returns the return code of the thread. -// This method is roughly the equivalent of pthread_join(). -// -// Exceptions raised by the blocking thread will be re-thrown into the main thread. -// -void Threading::pxThread::Block() -{ - AffinityAssert_DisallowFromSelf(pxDiagSpot); - WaitOnSelf(m_mtx_InThread); -} - -bool Threading::pxThread::Block(const wxTimeSpan& timeout) -{ - AffinityAssert_DisallowFromSelf(pxDiagSpot); - return WaitOnSelf(m_mtx_InThread, timeout); -} - -bool Threading::pxThread::IsSelf() const -{ - // Detached threads may have their pthread handles recycled as newer threads, causing - // false IsSelf reports. - return !m_detached && (pthread_self() == m_thread); -} - -bool Threading::pxThread::IsRunning() const -{ - return m_running; -} - -void Threading::pxThread::AddListener(EventListener_Thread& evt) -{ - evt.SetThread(this); - m_evtsrc_OnDelete.Add(evt); -} - -// Throws an exception if the thread encountered one. Uses the BaseException's Rethrow() method, -// which ensures the exception type remains consistent. Debuggable stacktraces will be lost, since -// the thread will have allowed itself to terminate properly. -void Threading::pxThread::RethrowException() const -{ - // Thread safety note: always detach the m_except pointer. If we checked it for NULL, the - // pointer might still be invalid after detachment, so might as well just detach and check - // after. - - ScopedExcept ptr(const_cast(this)->m_except.DetachPtr()); - if (ptr) - ptr->Rethrow(); -} - -static bool m_BlockDeletions = false; - -bool Threading::AllowDeletions() -{ - AffinityAssert_AllowFrom_MainUI(); - return !m_BlockDeletions; -} - -void Threading::YieldToMain() -{ - m_BlockDeletions = true; - wxTheApp->Yield(true); - m_BlockDeletions = false; -} - -void Threading::pxThread::_selfRunningTest(const wxChar* name) const -{ - if (HasPendingException()) - { - pxThreadLog.Error(GetName(), pxsFmt(L"An exception was thrown while waiting on a %s.", name)); - RethrowException(); - } - - if (!m_running) - { - throw Exception::CancelEvent(pxsFmt( - L"Blocking thread %s was terminated while another thread was waiting on a %s.", - WX_STR(GetName()), name).ToStdString()); - } - - // Thread is still alive and kicking (for now) -- yield to other messages and hope - // that impending chaos does not ensue. [it shouldn't since we block pxThread - // objects from being deleted until outside the scope of a mutex/semaphore wait). - - if ((wxTheApp != NULL) && wxThread::IsMain() && !_WaitGui_RecursionGuard(L"WaitForSelf")) - Threading::YieldToMain(); -} - -// This helper function is a deadlock-safe method of waiting on a semaphore in a pxThread. If the -// thread is terminated or canceled by another thread or a nested action prior to the semaphore being -// posted, this function will detect that and throw a CancelEvent exception is thrown. -// -// Note: Use of this function only applies to semaphores which are posted by the worker thread. Calling -// this function from the context of the thread itself is an error, and a dev assertion will be generated. -// -// Exceptions: -// This function will rethrow exceptions raised by the persistent thread, if it throws an error -// while the calling thread is blocking (which also means the persistent thread has terminated). -// -void Threading::pxThread::WaitOnSelf(Semaphore& sem) const -{ - if (!AffinityAssert_DisallowFromSelf(pxDiagSpot)) - return; - - while (true) - { - if (sem.WaitWithoutYield(wxTimeSpan(0, 0, 0, 333))) - return; - _selfRunningTest(L"semaphore"); - } -} - -// This helper function is a deadlock-safe method of waiting on a mutex in a pxThread. -// If the thread is terminated or canceled by another thread or a nested action prior to the -// mutex being unlocked, this function will detect that and a CancelEvent exception is thrown. -// -// Note: Use of this function only applies to mutexes which are acquired by a worker thread. -// Calling this function from the context of the thread itself is an error, and a dev assertion -// will be generated. -// -// Exceptions: -// This function will rethrow exceptions raised by the persistent thread, if it throws an -// error while the calling thread is blocking (which also means the persistent thread has -// terminated). -// -void Threading::pxThread::WaitOnSelf(Mutex& mutex) const -{ - if (!AffinityAssert_DisallowFromSelf(pxDiagSpot)) - return; - - while (true) - { - if (mutex.WaitWithoutYield(wxTimeSpan(0, 0, 0, 333))) - return; - _selfRunningTest(L"mutex"); - } -} - -static const wxTimeSpan SelfWaitInterval(0, 0, 0, 333); - -bool Threading::pxThread::WaitOnSelf(Semaphore& sem, const wxTimeSpan& timeout) const -{ - if (!AffinityAssert_DisallowFromSelf(pxDiagSpot)) - return true; - - wxTimeSpan runningout(timeout); - - while (runningout.GetMilliseconds() > 0) - { - const wxTimeSpan interval((SelfWaitInterval < runningout) ? SelfWaitInterval : runningout); - if (sem.WaitWithoutYield(interval)) - return true; - _selfRunningTest(L"semaphore"); - runningout -= interval; - } - return false; -} - -bool Threading::pxThread::WaitOnSelf(Mutex& mutex, const wxTimeSpan& timeout) const -{ - if (!AffinityAssert_DisallowFromSelf(pxDiagSpot)) - return true; - - wxTimeSpan runningout(timeout); - - while (runningout.GetMilliseconds() > 0) - { - const wxTimeSpan interval((SelfWaitInterval < runningout) ? SelfWaitInterval : runningout); - if (mutex.WaitWithoutYield(interval)) - return true; - _selfRunningTest(L"mutex"); - runningout -= interval; - } - return false; -} - -// Inserts a thread cancellation point. If the thread has received a cancel request, this -// function will throw an SEH exception designed to exit the thread (so make sure to use C++ -// object encapsulation for anything that could leak resources, to ensure object unwinding -// and cleanup, or use the DoThreadCleanup() override to perform resource cleanup). -void Threading::pxThread::TestCancel() const -{ - AffinityAssert_AllowFromSelf(pxDiagSpot); - pthread_testcancel(); -} - -// Executes the virtual member method -void Threading::pxThread::_try_virtual_invoke(void (pxThread::*method)()) -{ - try - { - (this->*method)(); - } - - // ---------------------------------------------------------------------------- - // Neat repackaging for STL Runtime errors... - // - catch (std::runtime_error& ex) - { - m_except = new Exception::RuntimeError(ex, GetName().ToUTF8()); - } - - // ---------------------------------------------------------------------------- - catch (Exception::RuntimeError& ex) - { - BaseException* woot = ex.Clone(); - woot->DiagMsg() += pxsFmt(L"(thread:%s)", WX_STR(GetName())).ToUTF8(); - m_except = woot; - } -#ifndef PCSX2_DEVBUILD - // ---------------------------------------------------------------------------- - // Bleh... don't bother with std::exception. runtime_error should catch anything - // useful coming out of the core STL libraries anyway, and these are best handled by - // the MSVC debugger (or by silent random annoying fail on debug-less linux). - /*catch( std::logic_error& ex ) - { - throw BaseException( pxsFmt( L"STL Logic Error (thread:%s): %s", - WX_STR(GetName()), WX_STR(fromUTF8( ex.what() )) ) - ); - } - catch( std::exception& ex ) - { - throw BaseException( pxsFmt( L"STL exception (thread:%s): %s", - WX_STR(GetName()), WX_STR(fromUTF8( ex.what() )) ) - ); - }*/ - // ---------------------------------------------------------------------------- - // BaseException -- same deal as LogicErrors. - // - catch (BaseException& ex) - { - BaseException* woot = ex.Clone(); - woot->DiagMsg() += pxsFmt(L"(thread:%s)", WX_STR(GetName())).ToUTF8(); - m_except = woot; - } -#endif -} - -// invoked internally when canceling or exiting the thread. Extending classes should implement -// OnCleanupInThread() to extend cleanup functionality. -void Threading::pxThread::_ThreadCleanup() -{ - AffinityAssert_AllowFromSelf(pxDiagSpot); - _try_virtual_invoke(&pxThread::OnCleanupInThread); - m_mtx_InThread.Release(); - - // Must set m_running LAST, as thread destructors depend on this value (it is used - // to avoid destruction of the thread until all internal data use has stopped. - m_running = false; -} - -wxString Threading::pxThread::GetName() const -{ - ScopedLock lock(m_mtx_ThreadName); - return m_name; -} - -void Threading::pxThread::SetName(const wxString& newname) -{ - ScopedLock lock(m_mtx_ThreadName); - m_name = newname; -} - -// This override is called by PeristentThread when the thread is first created, prior to -// calling ExecuteTaskInThread, and after the initial InThread lock has been claimed. -// This code is also executed within a "safe" environment, where the creating thread is -// blocked against m_sem_event. Make sure to do any necessary variable setup here, without -// worry that the calling thread might attempt to test the status of those variables -// before initialization has completed. -// -void Threading::pxThread::OnStartInThread() -{ - m_detached = false; - m_running = true; -} - -void Threading::pxThread::_internal_execute() -{ - m_mtx_InThread.Acquire(); - - _DoSetThreadName(GetName()); - make_curthread_key(this); - if (curthread_key) - pthread_setspecific(curthread_key, this); - - OnStartInThread(); - m_sem_startup.Post(); - - _try_virtual_invoke(&pxThread::ExecuteTaskInThread); -} - -// Called by Start, prior to actual starting of the thread, and after any previous -// running thread has been canceled or detached. -void Threading::pxThread::OnStart() -{ - FrankenMutex(m_mtx_InThread); - m_sem_event.Reset(); - m_sem_startup.Reset(); -} - -// Extending classes that override this method should always call it last from their -// personal implementations. -void Threading::pxThread::OnCleanupInThread() -{ - if (curthread_key) - pthread_setspecific(curthread_key, NULL); - - unmake_curthread_key(); - - m_evtsrc_OnDelete.Dispatch(0); -} - -// passed into pthread_create, and is used to dispatch the thread's object oriented -// callback function -void* Threading::pxThread::_internal_callback(void* itsme) -{ - if (!pxAssert(itsme != NULL)) - return NULL; - - internal_callback_helper(itsme); - return nullptr; -} - -// __try is used in pthread_cleanup_push when CLEANUP_SEH is used as the cleanup model. -// That can't be used in a function that has objects that require unwinding (compile -// error C2712), so move it into a separate function. -void Threading::pxThread::internal_callback_helper(void* itsme) -{ - pxThread& owner = *static_cast(itsme); - - pthread_cleanup_push(_pt_callback_cleanup, itsme); - owner._internal_execute(); - pthread_cleanup_pop(true); -} - -void Threading::pxThread::_DoSetThreadName(const wxString& name) -{ - _DoSetThreadName(static_cast(name.ToUTF8())); -} - -// -------------------------------------------------------------------------------------- -// pthread Cond is an evil api that is not suited for Pcsx2 needs. -// Let's not use it. (Air) -// -------------------------------------------------------------------------------------- - -#if 0 -Threading::WaitEvent::WaitEvent() -{ - int err = 0; - - err = pthread_cond_init(&cond, NULL); - err = pthread_mutex_init(&mutex, NULL); -} - -Threading::WaitEvent::~WaitEvent() -{ - pthread_cond_destroy( &cond ); - pthread_mutex_destroy( &mutex ); -} - -void Threading::WaitEvent::Set() -{ - pthread_mutex_lock( &mutex ); - pthread_cond_signal( &cond ); - pthread_mutex_unlock( &mutex ); -} - -void Threading::WaitEvent::Wait() -{ - pthread_mutex_lock( &mutex ); - pthread_cond_wait( &cond, &mutex ); - pthread_mutex_unlock( &mutex ); -} -#endif - -// -------------------------------------------------------------------------------------- -// BaseThreadError -// -------------------------------------------------------------------------------------- - -std::string Exception::BaseThreadError::FormatDiagnosticMessage() const -{ - // This is dangerous and stupid. Thanks wx/px/nonsense. - wxString thread_name = (m_thread == NULL) ? L"Null Thread Object" : m_thread->GetName(); - return StringUtil::StdStringFromFormat(m_message_diag.c_str(), thread_name.ToUTF8().data()); -} - -std::string Exception::BaseThreadError::FormatDisplayMessage() const -{ - wxString thread_name = (m_thread == NULL) ? L"Null Thread Object" : m_thread->GetName(); - return StringUtil::StdStringFromFormat(m_message_diag.c_str(), thread_name.ToUTF8().data()); -} - -pxThread& Exception::BaseThreadError::Thread() -{ - pxAssertDev(m_thread != NULL, "NULL thread object on ThreadError exception."); - return *m_thread; -} -const pxThread& Exception::BaseThreadError::Thread() const -{ - pxAssertDev(m_thread != NULL, "NULL thread object on ThreadError exception."); - return *m_thread; -} - -#ifndef __APPLE__ - -Threading::Semaphore::Semaphore() -{ - sem_init(&m_sema, false, 0); -} - -Threading::Semaphore::~Semaphore() -{ - sem_destroy(&m_sema); -} - -void Threading::Semaphore::Reset() -{ - sem_destroy(&m_sema); - sem_init(&m_sema, false, 0); -} - -void Threading::Semaphore::Post() -{ - sem_post(&m_sema); -} - -void Threading::Semaphore::Post(int multiple) -{ -#if defined(_MSC_VER) - sem_post_multiple(&m_sema, multiple); -#else - // Only w32pthreads has the post_multiple, but it's easy enough to fake: - while (multiple > 0) - { - multiple--; - sem_post(&m_sema); - } -#endif -} - -void Threading::Semaphore::WaitWithoutYield() -{ - pxAssertMsg(!wxThread::IsMain(), "Unyielding semaphore wait issued from the main/gui thread. Please use Wait() instead."); - sem_wait(&m_sema); -} - -bool Threading::Semaphore::WaitWithoutYield(const wxTimeSpan& timeout) -{ - wxDateTime megafail(wxDateTime::UNow() + timeout); - const timespec fail = {megafail.GetTicks(), megafail.GetMillisecond() * 1000000}; - return sem_timedwait(&m_sema, &fail) == 0; -} - - -// This is a wxApp-safe implementation of Wait, which makes sure and executes the App's -// pending messages *if* the Wait is performed on the Main/GUI thread. This ensures that -// user input continues to be handled and that windoes continue to repaint. If the Wait is -// called from another thread, no message pumping is performed. -// -void Threading::Semaphore::Wait() -{ -#if wxUSE_GUI - if (!wxThread::IsMain() || (wxTheApp == NULL)) - { - sem_wait(&m_sema); - } - else if (_WaitGui_RecursionGuard(L"Semaphore::Wait")) - { - sem_wait(&m_sema); - } - else - { - //ScopedBusyCursor hourglass( Cursor_KindaBusy ); - while (!WaitWithoutYield(def_yieldgui_interval)) - YieldToMain(); - } -#else - sem_wait(&m_sema); -#endif -} - -// This is a wxApp-safe implementation of WaitWithoutYield, which makes sure and executes the App's -// pending messages *if* the Wait is performed on the Main/GUI thread. This ensures that -// user input continues to be handled and that windows continue to repaint. If the Wait is -// called from another thread, no message pumping is performed. -// -// Returns: -// false if the wait timed out before the semaphore was signaled, or true if the signal was -// reached prior to timeout. -// -bool Threading::Semaphore::Wait(const wxTimeSpan& timeout) -{ -#if wxUSE_GUI - if (!wxThread::IsMain() || (wxTheApp == NULL)) - { - return WaitWithoutYield(timeout); - } - else if (_WaitGui_RecursionGuard(L"Semaphore::TimedWait")) - { - return WaitWithoutYield(timeout); - } - else - { - //ScopedBusyCursor hourglass( Cursor_KindaBusy ); - wxTimeSpan countdown((timeout)); - - do - { - if (WaitWithoutYield(def_yieldgui_interval)) - break; - YieldToMain(); - countdown -= def_yieldgui_interval; - } while (countdown.GetMilliseconds() > 0); - - return countdown.GetMilliseconds() > 0; - } -#else - return WaitWithoutYield(timeout); -#endif -} - -// Performs an uncancellable wait on a semaphore; restoring the thread's previous cancel state -// after the wait has completed. Useful for situations where the semaphore itself is stored on -// the stack and passed to another thread via GUI message or such, avoiding complications where -// the thread might be canceled and the stack value becomes invalid. -// -// Performance note: this function has quite a bit more overhead compared to Semaphore::WaitWithoutYield(), so -// consider manually specifying the thread as uncancellable and using WaitWithoutYield() instead if you need -// to do a lot of no-cancel waits in a tight loop worker thread, for example. -void Threading::Semaphore::WaitNoCancel() -{ - int oldstate; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); - //WaitWithoutYield(); - Wait(); - pthread_setcancelstate(oldstate, NULL); -} - -void Threading::Semaphore::WaitNoCancel(const wxTimeSpan& timeout) -{ - int oldstate; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); - //WaitWithoutYield( timeout ); - Wait(timeout); - pthread_setcancelstate(oldstate, NULL); -} - -bool Threading::Semaphore::TryWait() -{ - return sem_trywait(&m_sema) == 0; -} - -int Threading::Semaphore::Count() -{ - int retval; - sem_getvalue(&m_sema, &retval); - return retval; -} - -#else - -static void MACH_CHECK(kern_return_t mach_retval) -{ - switch (mach_retval) - { - case KERN_SUCCESS: - break; - case KERN_ABORTED: // Awoken due reason unrelated to semaphore (e.g. pthread_cancel) - pthread_testcancel(); // Unlike sem_wait, mach semaphore ops aren't cancellation points - // fallthrough - default: - fprintf(stderr, "mach error: %s", mach_error_string(mach_retval)); - assert(mach_retval == KERN_SUCCESS); - } -} - -/// Wait up to the given time -/// Returns true if successful, false if timed out -static bool WaitUpTo(semaphore_t sema, wxTimeSpan wxtime) -{ - mach_timespec_t time; - u64 ms = wxtime.GetMilliseconds().GetValue(); - time.tv_sec = ms / 1000; - time.tv_nsec = (ms % 1000) * 1000000; - kern_return_t res = semaphore_timedwait(sema, time); - if (res == KERN_OPERATION_TIMED_OUT) - return false; - MACH_CHECK(res); - return true; -} - -Threading::Semaphore::Semaphore() -{ - // other platforms explicitly make a thread-private (unshared) semaphore - // here. But it seems Mach doesn't support that. - MACH_CHECK(semaphore_create(mach_task_self(), (semaphore_t*)&m_sema, SYNC_POLICY_FIFO, 0)); - __atomic_store_n(&m_counter, 0, __ATOMIC_RELEASE); -} - -Threading::Semaphore::~Semaphore() -{ - MACH_CHECK(semaphore_destroy(mach_task_self(), (semaphore_t)m_sema)); -} - -void Threading::Semaphore::Reset() -{ - MACH_CHECK(semaphore_destroy(mach_task_self(), (semaphore_t)m_sema)); - MACH_CHECK(semaphore_create(mach_task_self(), (semaphore_t*)&m_sema, SYNC_POLICY_FIFO, 0)); - __atomic_store_n(&m_counter, 0, __ATOMIC_SEQ_CST); -} - -void Threading::Semaphore::Post() -{ - if (__atomic_fetch_add(&m_counter, 1, __ATOMIC_RELEASE) < 0) - MACH_CHECK(semaphore_signal(m_sema)); -} - -void Threading::Semaphore::Post(int multiple) -{ - for (int i = 0; i < multiple; ++i) - { - Post(); - } -} - -void Threading::Semaphore::WaitWithoutYield() -{ - pxAssertMsg(!wxThread::IsMain(), "Unyielding semaphore wait issued from the main/gui thread. Please use Wait() instead."); - if (__atomic_sub_fetch(&m_counter, 1, __ATOMIC_ACQUIRE) < 0) - MACH_CHECK(semaphore_wait(m_sema)); -} - -bool Threading::Semaphore::WaitWithoutYield(const wxTimeSpan& timeout) -{ - // This method is the reason why there has to be a special Darwin - // implementation of Semaphore. Note that semaphore_timedwait() is prone - // to returning with KERN_ABORTED, which basically signifies that some - // signal has worken it up. The best official "documentation" for - // semaphore_timedwait() is the way it's used in Grand Central Dispatch, - // which is open-source. - - if (__atomic_sub_fetch(&m_counter, 1, __ATOMIC_ACQUIRE) >= 0) - return true; - - // on x86 platforms, mach_absolute_time() returns nanoseconds - // TODO(aktau): on iOS a scale value from mach_timebase_info will be necessary - u64 const kOneThousand = 1000; - u64 const kOneBillion = kOneThousand * kOneThousand * kOneThousand; - u64 const delta = timeout.GetMilliseconds().GetValue() * (kOneThousand * kOneThousand); - mach_timespec_t ts; - kern_return_t kr = KERN_ABORTED; - for (u64 now = mach_absolute_time(), deadline = now + delta; - kr == KERN_ABORTED; now = mach_absolute_time()) - { - if (now > deadline) - { - // timed out by definition - kr = KERN_OPERATION_TIMED_OUT; - break; - } - - u64 timeleft = deadline - now; - ts.tv_sec = timeleft / kOneBillion; - ts.tv_nsec = timeleft % kOneBillion; - - // possible return values of semaphore_timedwait() (from XNU sources): - // internal kernel val -> return value - // THREAD_INTERRUPTED -> KERN_ABORTED - // THREAD_TIMED_OUT -> KERN_OPERATION_TIMED_OUT - // THREAD_AWAKENED -> KERN_SUCCESS - // THREAD_RESTART -> KERN_TERMINATED - // default -> KERN_FAILURE - kr = semaphore_timedwait(m_sema, ts); - } - - if (kr == KERN_OPERATION_TIMED_OUT) - { - int orig = __atomic_load_n(&m_counter, __ATOMIC_RELAXED); - while (orig < 0) - { - if (__atomic_compare_exchange_n(&m_counter, &orig, orig + 1, true, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) - return false; - } - // Semaphore was signalled between our wait expiring and now, keep kernel sema in sync - kr = semaphore_wait(m_sema); - } - - // while it's entirely possible to have KERN_FAILURE here, we should - // probably assert so we can study and correct the actual error here - // (the thread dying while someone is wainting for it). - MACH_CHECK(kr); - return true; -} - -// This is a wxApp-safe implementation of Wait, which makes sure and executes the App's -// pending messages *if* the Wait is performed on the Main/GUI thread. This ensures that -// user input continues to be handled and that windows continue to repaint. If the Wait is -// called from another thread, no message pumping is performed. -void Threading::Semaphore::Wait() -{ -#if wxUSE_GUI - if (!wxThread::IsMain() || (wxTheApp == NULL)) - { - WaitWithoutYield(); - } - else if (_WaitGui_RecursionGuard(L"Semaphore::Wait")) - { - WaitWithoutYield(); - } - else - { - if (__atomic_sub_fetch(&m_counter, 1, __ATOMIC_ACQUIRE) >= 0) - return; - while (!WaitUpTo(m_sema, def_yieldgui_interval)) - { - YieldToMain(); - } - } -#else - WaitWithoutYield(); -#endif -} - -// This is a wxApp-safe implementation of WaitWithoutYield, which makes sure and executes the App's -// pending messages *if* the Wait is performed on the Main/GUI thread. This ensures that -// user input continues to be handled and that windows continue to repaint. If the Wait is -// called from another thread, no message pumping is performed. -// -// Returns: -// false if the wait timed out before the semaphore was signaled, or true if the signal was -// reached prior to timeout. -// -bool Threading::Semaphore::Wait(const wxTimeSpan& timeout) -{ -#if wxUSE_GUI - if (!wxThread::IsMain() || (wxTheApp == NULL)) - { - return WaitWithoutYield(timeout); - } - else if (_WaitGui_RecursionGuard(L"Semaphore::TimedWait")) - { - return WaitWithoutYield(timeout); - } - else - { - wxTimeSpan countdown((timeout)); - - do - { - if (WaitWithoutYield(def_yieldgui_interval)) - break; - YieldToMain(); - countdown -= def_yieldgui_interval; - } while (countdown.GetMilliseconds() > 0); - - return countdown.GetMilliseconds() > 0; - } -#else - return WaitWithoutYield(timeout); -#endif -} - -bool Threading::Semaphore::TryWait() -{ - int counter = __atomic_load_n(&m_counter, __ATOMIC_RELAXED); - while (counter > 0 && !__atomic_compare_exchange_n(&m_counter, &counter, counter - 1, true, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) - ; - return counter > 0; -} - -// Performs an uncancellable wait on a semaphore; restoring the thread's previous cancel state -// after the wait has completed. Useful for situations where the semaphore itself is stored on -// the stack and passed to another thread via GUI message or such, avoiding complications where -// the thread might be canceled and the stack value becomes invalid. -// -// Performance note: this function has quite a bit more overhead compared to Semaphore::WaitWithoutYield(), so -// consider manually specifying the thread as uncancellable and using WaitWithoutYield() instead if you need -// to do a lot of no-cancel waits in a tight loop worker thread, for example. -// -// I'm unsure how to do this with pure Mach primitives, the docs in -// osfmk/man seem a bit out of date so perhaps there's a possibility, but -// since as far as I know Mach threads are 1-to-1 on BSD uthreads (and thus -// POSIX threads), this should work. -- aktau -void Threading::Semaphore::WaitNoCancel() -{ - int oldstate; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); - Wait(); - pthread_setcancelstate(oldstate, NULL); -} - -void Threading::Semaphore::WaitNoCancel(const wxTimeSpan& timeout) -{ - int oldstate; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); - Wait(timeout); - pthread_setcancelstate(oldstate, NULL); -} - -int Threading::Semaphore::Count() -{ - return __atomic_load_n(&m_counter, __ATOMIC_RELAXED); -} - -#endif diff --git a/pcsx2/gui/PersistentThread.h b/pcsx2/gui/PersistentThread.h deleted file mode 100644 index 1ced6e68e2..0000000000 --- a/pcsx2/gui/PersistentThread.h +++ /dev/null @@ -1,736 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "common/Threading.h" -#include "common/EventSource.h" -#include "common/Exceptions.h" -#include "common/Console.h" -#include "common/TraceLog.h" -#include "StringHelpers.h" -#include -#include - -#ifdef __APPLE__ -#include -#else -#include -#endif - -// -------------------------------------------------------------------------------------- -// DiagnosticOrigin -// -------------------------------------------------------------------------------------- -struct DiagnosticOrigin -{ - const char* srcfile; - const char* function; - const char* condition; - int line; - - DiagnosticOrigin(const char* _file, int _line, const char* _func, const char* _cond = nullptr) - : srcfile(_file) - , function(_func) - , condition(_cond) - , line(_line) - { - } - - std::string ToString(const char* msg = nullptr) const; -}; - -#define pxDiagSpot DiagnosticOrigin(__FILE__, __LINE__, __pxFUNCTION__) -#define pxAssertSpot(cond) DiagnosticOrigin(__FILE__, __LINE__, __pxFUNCTION__, #cond) - -namespace Threading -{ -class pxThread; -} - -#undef Yield // release the burden of windows.h global namespace spam. - -#define AffinityAssert_AllowFrom_MainUI() \ - pxAssertMsg(wxThread::IsMain(), "Thread affinity violation: Call allowed from main thread only.") - -// -------------------------------------------------------------------------------------- -// pxThreadLog / ConsoleLogSource_Threading -// -------------------------------------------------------------------------------------- - -class ConsoleLogSource_Threading : ConsoleLogSource -{ - typedef ConsoleLogSource _parent; - -public: - using _parent::IsActive; - - ConsoleLogSource_Threading(); - - bool Write(const wxString& thrname, const wxChar* msg) - { - return _parent::Write("%s", (wxsFormat(L"(thread:%s) ", WX_STR(thrname)) + msg).ToUTF8().data()); - } - bool Warn(const wxString& thrname, const wxChar* msg) - { - return _parent::Write("%s", (wxsFormat(L"(thread:%s) ", WX_STR(thrname)) + msg).ToUTF8().data()); - } - bool Error(const wxString& thrname, const wxChar* msg) - { - return _parent::Write("%s", (wxsFormat(L"(thread:%s) ", WX_STR(thrname)) + msg).ToUTF8().data()); - } -}; - -extern ConsoleLogSource_Threading pxConLog_Thread; - -#define pxThreadLog pxConLog_Thread.IsActive() && pxConLog_Thread - -using ScopedExcept = std::unique_ptr; - -namespace Exception -{ - // -------------------------------------------------------------------------------------- - // CancelAppEvent - Exception for canceling an event in a non-verbose fashion - // -------------------------------------------------------------------------------------- - // Typically the PCSX2 interface issues popup dialogs for runtime errors. This exception - // instead issues a "silent" cancelation that is handled by the app gracefully (generates - // log, and resumes messages queue processing). - // - // I chose to have this exception derive from RuntimeError, since if one is thrown from outside - // an App message loop we'll still want it to be handled in a reasonably graceful manner. - class CancelEvent : public RuntimeError - { - DEFINE_RUNTIME_EXCEPTION(CancelEvent, RuntimeError, "No reason given.") - - public: - explicit CancelEvent(std::string logmsg) - { - m_message_diag = std::move(logmsg); - // overridden message formatters only use the diagnostic version... - } - - virtual std::string FormatDisplayMessage() const override - { - return "Action canceled: " + m_message_diag; - } - - virtual std::string FormatDiagnosticMessage() const override - { - return "Action canceled: " + m_message_diag; - } - }; - - class ParseError : public RuntimeError - { - DEFINE_RUNTIME_EXCEPTION(ParseError, RuntimeError, "Parse error"); - }; - -#ifdef _WIN32 - // -------------------------------------------------------------------------------------- - // Exception::WinApiError - // -------------------------------------------------------------------------------------- - class WinApiError : public RuntimeError - { - DEFINE_EXCEPTION_COPYTORS(WinApiError, RuntimeError) - DEFINE_EXCEPTION_MESSAGES(WinApiError) - - public: - int ErrorId; - - public: - WinApiError(); - - std::string GetMsgFromWindows() const; - virtual std::string FormatDisplayMessage() const override; - virtual std::string FormatDiagnosticMessage() const override; - }; -#endif - - // -------------------------------------------------------------------------- - // Exception used to perform an "errorless" termination of the app during OnInit - // procedures. This happens when a user cancels out of startup prompts/wizards. - // - class StartupAborted : public CancelEvent - { - DEFINE_RUNTIME_EXCEPTION(StartupAborted, CancelEvent, "Startup initialization was aborted by the user.") - - public: - StartupAborted(std::string reason) - { - m_message_diag = "Startup aborted: " + reason; - } - }; - - class BaseThreadError : public RuntimeError - { - DEFINE_EXCEPTION_COPYTORS(BaseThreadError, RuntimeError) - DEFINE_EXCEPTION_MESSAGES(BaseThreadError) - - public: - Threading::pxThread* m_thread; - - protected: - BaseThreadError() - { - m_thread = NULL; - } - - public: - explicit BaseThreadError(Threading::pxThread* _thread) - { - m_thread = _thread; - m_message_diag = "An unspecified thread-related error occurred (thread=%s)"; - } - - explicit BaseThreadError(Threading::pxThread& _thread) - { - m_thread = &_thread; - m_message_diag = "An unspecified thread-related error occurred (thread=%s)"; - } - - virtual std::string FormatDiagnosticMessage() const override; - virtual std::string FormatDisplayMessage() const override; - - Threading::pxThread& Thread(); - const Threading::pxThread& Thread() const; - }; - - class ThreadCreationError : public BaseThreadError - { - DEFINE_EXCEPTION_COPYTORS(ThreadCreationError, BaseThreadError) - - public: - explicit ThreadCreationError(Threading::pxThread* _thread) - { - m_thread = _thread; - SetBothMsgs("Thread creation failure. An unspecified error occurred while trying to create the %s thread."); - } - - explicit ThreadCreationError(Threading::pxThread& _thread) - { - m_thread = &_thread; - SetBothMsgs("Thread creation failure. An unspecified error occurred while trying to create the %s thread."); - } - }; -} // namespace Exception - -// -------------------------------------------------------------------------------------- -// DESTRUCTOR_CATCHALL - safe destructor helper -// -------------------------------------------------------------------------------------- -// In C++ destructors *really* need to be "nothrow" garaunteed, otherwise you can have -// disasterous nested exception throws during the unwinding process of an originating -// exception. Use this macro to dispose of these dangerous exceptions, and generate a -// friendly error log in their wake. -// -// Note: Console can also fire an Exception::OutOfMemory -#define __DESTRUCTOR_CATCHALL(funcname) \ - catch (BaseException & ex) \ - { \ - try \ - { \ - Console.Error("Unhandled BaseException in %s (ignored!):", funcname); \ - Console.Error(ex.FormatDiagnosticMessage()); \ - } \ - catch (...) \ - { \ - fprintf(stderr, "ERROR: (out of memory?)\n"); \ - } \ - } \ - catch (std::exception & ex) \ - { \ - try \ - { \ - Console.Error("Unhandled std::exception in %s (ignored!):", funcname); \ - Console.Error(ex.what()); \ - } \ - catch (...) \ - { \ - fprintf(stderr, "ERROR: (out of memory?)\n"); \ - } \ - } \ - catch (...) \ - { \ - /* Unreachable code */ \ - } - -#define DESTRUCTOR_CATCHALL __DESTRUCTOR_CATCHALL(__pxFUNCTION__) - -namespace Threading -{ - extern void pxTestCancel(); - extern void YieldToMain(); - - extern const wxTimeSpan def_yieldgui_interval; - - extern pxThread* pxGetCurrentThread(); - extern wxString pxGetCurrentThreadName(); - extern bool _WaitGui_RecursionGuard(const wxChar* name); - - extern bool AllowDeletions(); - - class Mutex - { - protected: - pthread_mutex_t m_mutex; - - public: - Mutex(); - virtual ~Mutex(); - virtual bool IsRecursive() const { return false; } - - void Recreate(); - bool RecreateIfLocked(); - void Detach(); - - void Acquire(); - bool Acquire(const wxTimeSpan& timeout); - bool TryAcquire(); - void Release(); - - void AcquireWithoutYield(); - bool AcquireWithoutYield(const wxTimeSpan& timeout); - - void Wait(); - void WaitWithSpin(); - bool Wait(const wxTimeSpan& timeout); - void WaitWithoutYield(); - bool WaitWithoutYield(const wxTimeSpan& timeout); - - protected: - // empty constructor used by MutexLockRecursive - Mutex(bool) {} - }; - - class MutexRecursive : public Mutex - { - public: - MutexRecursive(); - virtual ~MutexRecursive(); - virtual bool IsRecursive() const { return true; } - }; - - // -------------------------------------------------------------------------------------- - // ScopedLock - // -------------------------------------------------------------------------------------- - // Helper class for using Mutexes. Using this class provides an exception-safe (and - // generally clean) method of locking code inside a function or conditional block. The lock - // will be automatically released on any return or exit from the function. - // - // Const qualification note: - // ScopedLock takes const instances of the mutex, even though the mutex is modified - // by locking and unlocking. Two rationales: - // - // 1) when designing classes with accessors (GetString, GetValue, etc) that need mutexes, - // this class needs a const hack to allow those accessors to be const (which is typically - // *very* important). - // - // 2) The state of the Mutex is guaranteed to be unchanged when the calling function or - // scope exits, by any means. Only via manual calls to Release or Acquire does that - // change, and typically those are only used in very special circumstances of their own. - // - class ScopedLock - { - DeclareNoncopyableObject(ScopedLock); - - protected: - Mutex* m_lock; - bool m_IsLocked; - - public: - virtual ~ScopedLock(); - explicit ScopedLock(const Mutex* locker = NULL); - explicit ScopedLock(const Mutex& locker); - void AssignAndLock(const Mutex& locker); - void AssignAndLock(const Mutex* locker); - - void Assign(const Mutex& locker); - void Assign(const Mutex* locker); - - void Release(); - void Acquire(); - - bool IsLocked() const { return m_IsLocked; } - - protected: - // Special constructor used by ScopedTryLock - ScopedLock(const Mutex& locker, bool isTryLock); - }; - - // -------------------------------------------------------------------------------------- - // ScopedPtrMT - // -------------------------------------------------------------------------------------- - - template - class ScopedPtrMT - { - DeclareNoncopyableObject(ScopedPtrMT); - - protected: - std::atomic m_ptr; - Threading::Mutex m_mtx; - - public: - typedef T element_type; - - wxEXPLICIT ScopedPtrMT(T* ptr = nullptr) - { - m_ptr = ptr; - } - - ~ScopedPtrMT() { _Delete_unlocked(); } - - ScopedPtrMT& Reassign(T* ptr = nullptr) - { - T* doh = m_ptr.exchange(ptr); - if (ptr != doh) - delete doh; - return *this; - } - - ScopedPtrMT& Delete() noexcept - { - ScopedLock lock(m_mtx); - _Delete_unlocked(); - } - - // Removes the pointer from scoped management, but does not delete! - // (ScopedPtr will be nullptr after this method) - T* DetachPtr() - { - ScopedLock lock(m_mtx); - - return m_ptr.exchange(nullptr); - } - - // Returns the managed pointer. Can return nullptr as a valid result if the ScopedPtrMT - // has no object in management. - T* GetPtr() const - { - return m_ptr; - } - - void SwapPtr(ScopedPtrMT& other) - { - ScopedLock lock(m_mtx); - m_ptr.exchange(other.m_ptr.exchange(m_ptr.load())); - T* const tmp = other.m_ptr; - other.m_ptr = m_ptr; - m_ptr = tmp; - } - - // ---------------------------------------------------------------------------- - // ScopedPtrMT Operators - // ---------------------------------------------------------------------------- - // I've decided to use the ATL's approach to pointer validity tests, opposed to - // the wx/boost approach (which uses some bizarre member method pointer crap, and can't - // allow the T* implicit casting. - - bool operator!() const noexcept - { - return m_ptr.load() == nullptr; - } - - // Equality - bool operator==(T* pT) const noexcept - { - return m_ptr == pT; - } - - // Inequality - bool operator!=(T* pT) const noexcept - { - return !operator==(pT); - } - - // Convenient assignment operator. ScopedPtrMT = nullptr will issue an automatic deletion - // of the managed pointer. - ScopedPtrMT& operator=(T* src) - { - return Reassign(src); - } - - #if 0 - operator T*() const - { - return m_ptr; - } - - // Dereference operator, returns a handle to the managed pointer. - // Generates a debug assertion if the object is nullptr! - T& operator*() const - { - pxAssert(m_ptr != nullptr); - return *m_ptr; - } - - T* operator->() const - { - pxAssert(m_ptr != nullptr); - return m_ptr; - } - #endif - - protected: - void _Delete_unlocked() noexcept - { - delete m_ptr.exchange(nullptr); - } - }; - - - // ---------------------------------------------------------------------------------------- - // RecursionGuard - Basic protection against function recursion - // ---------------------------------------------------------------------------------------- - // Thread safety note: If used in a threaded environment, you shoud use a handle to a __threadlocal - // storage variable (protects aaginst race conditions and, in *most* cases, is more desirable - // behavior as well. - // - // Rationale: wxWidgets has its own wxRecursionGuard, but it has a sloppy implementation with - // entirely unnecessary assertion checks. - // - class RecursionGuard - { - public: - int& Counter; - - RecursionGuard(int& counter) - : Counter(counter) - { - ++Counter; - } - - virtual ~RecursionGuard() - { - --Counter; - } - - bool IsReentrant() const { return Counter > 1; } - }; - - // -------------------------------------------------------------------------------------- - // ThreadDeleteEvent - // -------------------------------------------------------------------------------------- - class EventListener_Thread : public IEventDispatcher - { - public: - typedef int EvtParams; - - protected: - pxThread* m_thread; - - public: - EventListener_Thread() - { - m_thread = NULL; - } - - virtual ~EventListener_Thread() = default; - - void SetThread(pxThread& thr) { m_thread = &thr; } - void SetThread(pxThread* thr) { m_thread = thr; } - - void DispatchEvent(const int& params) - { - OnThreadCleanup(); - } - - protected: - // Invoked by the pxThread when the thread execution is ending. This is - // typically more useful than a delete listener since the extended thread information - // provided by virtualized functions/methods will be available. - // Important! This event is executed *by the thread*, so care must be taken to ensure - // thread sync when necessary (posting messages to the main thread, etc). - virtual void OnThreadCleanup() = 0; - }; - - class Semaphore - { - protected: -#ifdef __APPLE__ - semaphore_t m_sema; - int m_counter; -#else - sem_t m_sema; -#endif - - public: - Semaphore(); - virtual ~Semaphore(); - - void Reset(); - void Post(); - void Post(int multiple); - - void WaitWithoutYield(); - bool WaitWithoutYield(const wxTimeSpan& timeout); - void WaitNoCancel(); - void WaitNoCancel(const wxTimeSpan& timeout); - void WaitWithoutYieldWithSpin() - { - u32 waited = 0; - while (true) - { - if (TryWait()) - return; - if (waited >= SPIN_TIME_NS) - break; - waited += ShortSpin(); - } - WaitWithoutYield(); - } - bool TryWait(); - int Count(); - - void Wait(); - bool Wait(const wxTimeSpan& timeout); - }; - - // -------------------------------------------------------------------------------------- - // pxThread - Helper class for the basics of starting/managing persistent threads. - // -------------------------------------------------------------------------------------- - // This class is meant to be a helper for the typical threading model of "start once and - // reuse many times." This class incorporates a lot of extra overhead in stopping and - // starting threads, but in turn provides most of the basic thread-safety and event-handling - // functionality needed for a threaded operation. In practice this model is usually an - // ideal one for efficiency since Operating Systems themselves typically subscribe to a - // design where sleeping, suspending, and resuming threads is very efficient, but starting - // new threads has quite a bit of overhead. - // - // To use this as a base class for your threaded procedure, overload the following virtual - // methods: - // void OnStart(); - // void ExecuteTaskInThread(); - // void OnCleanupInThread(); - // - // Use the public methods Start() and Cancel() to start and shutdown the thread, and use - // m_sem_event internally to post/receive events for the thread (make a public accessor for - // it in your derived class if your thread utilizes the post). - // - // Notes: - // * Constructing threads as static global vars isn't recommended since it can potentially - // confuse w32pthreads, if the static initializers are executed out-of-order (C++ offers - // no dependency options for ensuring correct static var initializations). Use heap - // allocation to create thread objects instead. - // - class pxThread - { - DeclareNoncopyableObject(pxThread); - - protected: - wxString m_name; // diagnostic name for our thread. - pthread_t m_thread; - - WorkSema m_sem_event; // general wait event that's needed by most threads - Semaphore m_sem_startup; // startup sync tool - Mutex m_mtx_InThread; // used for canceling and closing threads in a deadlock-safe manner - MutexRecursive m_mtx_start; // used to lock the Start() code from starting simultaneous threads accidentally. - Mutex m_mtx_ThreadName; - - std::atomic m_detached; // a boolean value which indicates if the m_thread handle is valid - std::atomic m_running; // set true by Start(), and set false by Cancel(), Block(), etc. - - // exception handle, set non-NULL if the thread terminated with an exception - // Use RethrowException() to re-throw the exception using its original exception type. - ScopedPtrMT m_except; - - EventSource m_evtsrc_OnDelete; - - - public: - virtual ~pxThread(); - pxThread(const wxString& name = L"pxThread"); - - pthread_t GetId() const { return m_thread; } - - virtual void Start(); - virtual void Cancel(bool isBlocking = true); - virtual bool Cancel(const wxTimeSpan& timeout); - virtual bool Detach(); - virtual void Block(); - virtual bool Block(const wxTimeSpan& timeout); - virtual void RethrowException() const; - - void AddListener(EventListener_Thread& evt); - void AddListener(EventListener_Thread* evt) - { - if (evt == NULL) - return; - AddListener(*evt); - } - - void WaitOnSelf(Semaphore& mutex) const; - void WaitOnSelf(Mutex& mutex) const; - bool WaitOnSelf(Semaphore& mutex, const wxTimeSpan& timeout) const; - bool WaitOnSelf(Mutex& mutex, const wxTimeSpan& timeout) const; - - bool IsRunning() const; - bool IsSelf() const; - bool HasPendingException() const { return !!m_except; } - - wxString GetName() const; - void SetName(const wxString& newname); - - protected: - // Extending classes should always implement your own OnStart(), which is called by - // Start() once necessary locks have been obtained. Do not override Start() directly - // unless you're really sure that's what you need to do. ;) - virtual void OnStart(); - - virtual void OnStartInThread(); - - // This is called when the thread has been canceled or exits normally. The pxThread - // automatically binds it to the pthread cleanup routines as soon as the thread starts. - virtual void OnCleanupInThread(); - - // Implemented by derived class to perform actual threaded task! - virtual void ExecuteTaskInThread() = 0; - - void TestCancel() const; - - // Yields this thread to other threads and checks for cancellation. A sleeping thread should - // always test for cancellation, however if you really don't want to, you can use Threading::Sleep() - // or better yet, disable cancellation of the thread completely with DisableCancellation(). - // - // Parameters: - // ms - 'minimum' yield time in milliseconds (rough -- typically yields are longer by 1-5ms - // depending on operating system/platform). If ms is 0 or unspecified, then a single - // timeslice is yielded to other contending threads. If no threads are contending for - // time when ms==0, then no yield is done, but cancellation is still tested. - void Yield(int ms = 0) - { - pxAssert(IsSelf()); - Threading::Sleep(ms); - TestCancel(); - } - - void FrankenMutex(Mutex& mutex); - - bool AffinityAssert_AllowFromSelf(const DiagnosticOrigin& origin) const; - bool AffinityAssert_DisallowFromSelf(const DiagnosticOrigin& origin) const; - - // ---------------------------------------------------------------------------- - // Section of methods for internal use only. - - bool _basecancel(); - void _selfRunningTest(const wxChar* name) const; - void _DoSetThreadName(const wxString& name); - void _DoSetThreadName(const char* name) { SetNameOfCurrentThread(name); } - void _internal_execute(); - void _try_virtual_invoke(void (pxThread::*method)()); - void _ThreadCleanup(); - - static void* _internal_callback(void* func); - static void internal_callback_helper(void* func); - static void _pt_callback_cleanup(void* handle); - }; -} // namespace Threading diff --git a/pcsx2/gui/RecentIsoList.cpp b/pcsx2/gui/RecentIsoList.cpp deleted file mode 100644 index 1c5909a7b9..0000000000 --- a/pcsx2/gui/RecentIsoList.cpp +++ /dev/null @@ -1,306 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "AppCoreThread.h" -#include "RecentIsoList.h" -#include "IsoDropTarget.h" -#include "IniInterface.h" - -extern wxString GetMsg_IsoImageChanged(); - -// FIXME : This needs to handle removed/missing ISOs somehow, although I'm not sure the -// best approach. I think I'd prefer for missing entries to only be removed when they -// are selected. This also means we'll need to add some sort of "no current selection" -// menu option that's defaulted to when a selection is deemed missing (since just randomly -// selecting another iso would be undesirable). - - -RecentIsoManager::RecentIsoManager( wxMenu* menu, int firstIdForMenuItems_or_wxID_ANY ) - : m_Menu( menu ) - , m_MaxLength( g_Conf->RecentIsoCount ) - , m_firstIdForMenuItems_or_wxID_ANY ( firstIdForMenuItems_or_wxID_ANY ) -{ - m_cursel = 0; - m_Separator = nullptr; - m_ClearSeparator = nullptr; - m_Clear = nullptr; - m_ClearMissing = nullptr; - - IniLoader loader; - LoadListFrom(loader); - - Bind(wxEVT_MENU, &RecentIsoManager::OnChangedSelection, this); -} - -RecentIsoManager::~RecentIsoManager() -{ - Unbind(wxEVT_MENU, &RecentIsoManager::OnChangedSelection, this); -} - -void RecentIsoManager::OnChangedSelection( wxCommandEvent& evt ) -{ - uint cnt = m_Items.size(); - uint i=0; - for( ; iGetId() == evt.GetId()) ) break; - } - - if( i >= m_Items.size() ) - { - evt.Skip(); - return; - } - - // Actually there is no change on the selection so the event can be skip - // Note: It also avoids a deadlock which appears when the core thread is already paused - // and ScopedCoreThreadPopup try to stop the thread (GSOpen1 code path) - if( (g_Conf->CdvdSource == CDVD_SourceType::Iso) && (m_Items[i].Filename == g_Conf->CurrentIso) ) - { - evt.Skip(); - return; - } - - - m_cursel = i; - - ScopedCoreThreadPopup stopped_core; - - SwapOrReset_Iso( m_Menu->GetWindow(), stopped_core, m_Items[i].Filename, GetMsg_IsoImageChanged()); - - stopped_core.AllowResume(); -} - -void RecentIsoManager::RemoveAllFromMenu() -{ - if( m_Menu == NULL ) return; - - int cnt = m_Items.size(); - // Note: Go backwards to work around https://trac.wxwidgets.org/ticket/18772 - // Switch it back to forwards once that's fixed in a relased WX version - for( int i=cnt-1; i>=0; --i ) - { - RecentItem& curitem( m_Items[i] ); - if( curitem.ItemPtr == NULL ) continue; - m_Menu->Destroy( curitem.ItemPtr ); - curitem.ItemPtr = NULL; - } - - if( m_Separator != nullptr ) - { - m_Menu->Destroy( m_Separator ); - m_Separator = nullptr; - } - - if ( m_ClearSeparator != nullptr ) - { - m_Menu->Destroy( m_ClearSeparator ); - m_ClearSeparator = nullptr; - } - - if ( m_Clear != nullptr ) - { - m_Menu->Destroy( m_Clear ); - m_Clear = nullptr; - } - - if (m_ClearMissing != nullptr) - { - m_Menu->Destroy(m_ClearMissing); - m_ClearMissing = nullptr; - } -} - -void RecentIsoManager::Clear() -{ - RemoveAllFromMenu(); - m_Items.clear(); - Repopulate(); -} - -RecentIsoManager::VectorType RecentIsoManager::GetMissingFiles() const -{ - VectorType missing_files; - - std::copy_if( - m_Items.begin(), - m_Items.end(), - std::back_inserter(missing_files), - [](const RecentItem& item) { - return !wxFileExists(item.Filename); - }); - - return missing_files; -} - -void RecentIsoManager::ClearMissing() -{ - RemoveAllFromMenu(); - - VectorType existing_files; - - std::copy_if( - m_Items.begin(), - m_Items.end(), - std::back_inserter(existing_files), - [](const RecentItem& item) { - return wxFileExists(item.Filename); - }); - - m_Items = existing_files; - - Repopulate(); -} - -void RecentIsoManager::Repopulate() -{ - int cnt = m_Items.size(); - if( cnt <= 0 ) return; - - m_Separator = m_Menu->AppendSeparator(); - - //Note: the internal recent iso list (m_Items) has the most recent item last (also at the INI file) - // but the menu is composed in reverse order such that the most recent item appears at the top. - for( int i=cnt-1; i>=0; --i ) - InsertIntoMenu( i ); - - m_ClearSeparator = m_Menu->AppendSeparator(); - m_ClearMissing = m_Menu->Append(MenuIdentifiers::MenuId_IsoClearMissing, _("Clear missing files")); - m_Clear = m_Menu->Append(MenuIdentifiers::MenuId_IsoClear, _("Clear ISO list")); -} - -void RecentIsoManager::Add( const wxString& src ) -{ - if( src.IsEmpty() ) return; - - wxString normalized( Path::Normalize( src ) ); - - int cnt = m_Items.size(); - - if( cnt <= 0 ) - { - pxAssert( m_Separator == NULL ); - m_Separator = m_Menu->AppendSeparator(); - } - else - { - for( int i=0; iCheck(); - return; - } - } - } - - //New item doesn't exist at the menu/internal-list - add it, and refresh the menu. - RemoveAllFromMenu(); - - m_Items.push_back( RecentItem( normalized ) ); - - while( m_Items.size() > m_MaxLength ) - m_Items.erase( m_Items.begin() ); - - Repopulate(); - m_Items[m_cursel = m_Items.size()-1].ItemPtr->Check(); -} - -//id here is the position index at the internal list of recent ISOs (m_Items) -void RecentIsoManager::InsertIntoMenu( int id ) -{ - if( m_Menu == NULL ) return; - RecentItem& curitem( m_Items[id] ); - - int wxid=wxID_ANY; - if (this->m_firstIdForMenuItems_or_wxID_ANY != wxID_ANY) - wxid = this->m_firstIdForMenuItems_or_wxID_ANY + id; - - wxString filename = Path::GetFilename(curitem.Filename); - // & is used to specify the keyboard shortcut key in menu labels. && must - // be used to display an &. - filename.Replace("&", "&&", true); - - curitem.ItemPtr = m_Menu->AppendRadioItem( wxid, filename, curitem.Filename ); - curitem.ItemPtr->Enable(wxFileExists(curitem.Filename) && !g_Conf->AskOnBoot); -} - -void RecentIsoManager::EnableItems(bool display) -{ - for (const auto& list : m_Items) - { - // Files which don't exist still need to be grayed out. - list.ItemPtr->Enable(display && wxFileExists(list.Filename)); - } -} - -void RecentIsoManager::LoadListFrom( IniInterface& ini ) -{ - if (!ini.IsOk()) return; - - ini.GetConfig().SetRecordDefaults( false ); - - RemoveAllFromMenu(); - - m_MaxLength = g_Conf->RecentIsoCount; - ScopedIniGroup groupie( ini, L"RecentIso" ); - for( uint i=0; iCurrentIso ); - - ini.GetConfig().SetRecordDefaults( true ); -} - -void RecentIsoManager::AppStatusEvent_OnSettingsApplied() -{ - // TODO : Implement application of Recent Iso List "maximum" history option -} - -void RecentIsoManager::AppStatusEvent_OnUiSettingsLoadSave( const AppSettingsEventInfo& evt ) -{ - IniInterface& ini( evt.GetIni() ); - - if( ini.IsSaving() ) - { - // Wipe existing recent iso list if we're saving, because our size might have changed - // and that could leave some residual entries in the config. - - ini.GetConfig().SetRecordDefaults( false ); - - ini.GetConfig().DeleteGroup( L"RecentIso" ); - ScopedIniGroup groupie( ini, L"RecentIso" ); - - int cnt = m_Items.size(); - for( int i=0; i. - */ - -#pragma once - -#include "AppCommon.h" - -// -------------------------------------------------------------------------------------- -// RecentIsoManager -// -------------------------------------------------------------------------------------- -class RecentIsoManager : public wxEvtHandler, - public EventListener_AppStatus -{ -protected: - struct RecentItem - { - wxString Filename; - wxMenuItem* ItemPtr; - - RecentItem() { ItemPtr = NULL; } - - RecentItem( const wxString& src ) - : Filename( src ) - { - ItemPtr = NULL; - } - }; - -public: - using VectorType = std::vector; - -protected: - VectorType m_Items; - - wxMenu* m_Menu; - uint m_MaxLength; - int m_cursel; - - int m_firstIdForMenuItems_or_wxID_ANY; - - wxMenuItem* m_Separator; - wxMenuItem* m_ClearSeparator; - wxMenuItem* m_Clear; - wxMenuItem* m_ClearMissing; - -public: - RecentIsoManager( wxMenu* menu , int firstIdForMenuItems_or_wxID_ANY ); - virtual ~RecentIsoManager(); - - VectorType GetMissingFiles() const; - - void RemoveAllFromMenu(); - void EnableItems(bool display); - void Repopulate(); - void Clear(); - void ClearMissing(); - void Add( const wxString& src ); - -protected: - void InsertIntoMenu( int id ); - void OnChangedSelection( wxCommandEvent& evt ); - void LoadListFrom( IniInterface& ini ); - - void AppStatusEvent_OnUiSettingsLoadSave( const AppSettingsEventInfo& ini ); - void AppStatusEvent_OnSettingsApplied(); -}; - - -// -------------------------------------------------------------------------------------- -// RecentIsoList -// -------------------------------------------------------------------------------------- -struct RecentIsoList -{ - std::unique_ptr Manager; - std::unique_ptr Menu; - - RecentIsoList(int firstIdForMenuItems_or_wxID_ANY); - virtual ~RecentIsoList() = default; -}; - diff --git a/pcsx2/gui/Resources/BackgroundLogo.png b/pcsx2/gui/Resources/BackgroundLogo.png deleted file mode 100644 index 5784c12547..0000000000 Binary files a/pcsx2/gui/Resources/BackgroundLogo.png and /dev/null differ diff --git a/pcsx2/gui/Resources/Breakpoint_Active.png b/pcsx2/gui/Resources/Breakpoint_Active.png deleted file mode 100644 index c76aa7ec00..0000000000 Binary files a/pcsx2/gui/Resources/Breakpoint_Active.png and /dev/null differ diff --git a/pcsx2/gui/Resources/Breakpoint_Inactive.png b/pcsx2/gui/Resources/Breakpoint_Inactive.png deleted file mode 100644 index e0984ddeb7..0000000000 Binary files a/pcsx2/gui/Resources/Breakpoint_Inactive.png and /dev/null differ diff --git a/pcsx2/gui/Resources/ButtonIcon_Camera.png b/pcsx2/gui/Resources/ButtonIcon_Camera.png deleted file mode 100644 index 546f4a900c..0000000000 Binary files a/pcsx2/gui/Resources/ButtonIcon_Camera.png and /dev/null differ diff --git a/pcsx2/gui/Resources/ConfigIcon_Cpu.png b/pcsx2/gui/Resources/ConfigIcon_Cpu.png deleted file mode 100644 index 9fab429973..0000000000 Binary files a/pcsx2/gui/Resources/ConfigIcon_Cpu.png and /dev/null differ diff --git a/pcsx2/gui/Resources/ConfigIcon_Gamefixes.png b/pcsx2/gui/Resources/ConfigIcon_Gamefixes.png deleted file mode 100644 index ec699b7f93..0000000000 Binary files a/pcsx2/gui/Resources/ConfigIcon_Gamefixes.png and /dev/null differ diff --git a/pcsx2/gui/Resources/ConfigIcon_MemoryCard.png b/pcsx2/gui/Resources/ConfigIcon_MemoryCard.png deleted file mode 100644 index fc54c88a68..0000000000 Binary files a/pcsx2/gui/Resources/ConfigIcon_MemoryCard.png and /dev/null differ diff --git a/pcsx2/gui/Resources/ConfigIcon_Paths.png b/pcsx2/gui/Resources/ConfigIcon_Paths.png deleted file mode 100644 index 424e0e3c8e..0000000000 Binary files a/pcsx2/gui/Resources/ConfigIcon_Paths.png and /dev/null differ diff --git a/pcsx2/gui/Resources/ConfigIcon_Speedhacks.png b/pcsx2/gui/Resources/ConfigIcon_Speedhacks.png deleted file mode 100644 index 0f1a38e60f..0000000000 Binary files a/pcsx2/gui/Resources/ConfigIcon_Speedhacks.png and /dev/null differ diff --git a/pcsx2/gui/Resources/ConfigIcon_Video.png b/pcsx2/gui/Resources/ConfigIcon_Video.png deleted file mode 100644 index ca5763057e..0000000000 Binary files a/pcsx2/gui/Resources/ConfigIcon_Video.png and /dev/null differ diff --git a/pcsx2/gui/Resources/Logo.png b/pcsx2/gui/Resources/Logo.png deleted file mode 100644 index ac9ba41cdd..0000000000 Binary files a/pcsx2/gui/Resources/Logo.png and /dev/null differ diff --git a/pcsx2/gui/Resources/NoIcon.png b/pcsx2/gui/Resources/NoIcon.png deleted file mode 100644 index 0c393a2abb..0000000000 Binary files a/pcsx2/gui/Resources/NoIcon.png and /dev/null differ diff --git a/pcsx2/gui/Resources/bin2cpp.cmd b/pcsx2/gui/Resources/bin2cpp.cmd deleted file mode 100644 index 41b7663c1c..0000000000 --- a/pcsx2/gui/Resources/bin2cpp.cmd +++ /dev/null @@ -1,18 +0,0 @@ - -:: Probably self-explanatory: This batch file compiles a single souce image into a -:: CPP header file for use by pcsx2. -:: -:: bin2cpp.cmd SrcImage -:: -:: Parameters -:: SrcImage - Complete filename with extension. -:: - -@echo off - -SETLOCAL ENABLEEXTENSIONS - -cd "%~0\..\" -"..\..\..\tools\bin\bin2cpp.exe" %1 - -ENDLOCAL diff --git a/pcsx2/gui/Saveslots.cpp b/pcsx2/gui/Saveslots.cpp deleted file mode 100644 index d8c7d8941b..0000000000 --- a/pcsx2/gui/Saveslots.cpp +++ /dev/null @@ -1,155 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "App.h" -#include "AppSaveStates.h" -#include "ConsoleLogger.h" -#include "MainFrame.h" - -#include "Common.h" - -#include "GS.h" -#include "Elfheader.h" -#include "Saveslots.h" - -// -------------------------------------------------------------------------------------- -// Saveslot Section -// -------------------------------------------------------------------------------------- - -static int StatesC = 0; - -#ifdef USE_NEW_SAVESLOTS_UI -std::array saveslot_cache = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; -#endif - -// FIXME : Use of the IsSavingOrLoading flag is mostly a hack until we implement a -// complete thread to manage queuing savestate tasks, and zipping states to disk. --air -static std::atomic IsSavingOrLoading(false); - -class SysExecEvent_ClearSavingLoadingFlag : public SysExecEvent -{ -public: - wxString GetEventName() const { return L"ClearSavingLoadingFlag"; } - - virtual ~SysExecEvent_ClearSavingLoadingFlag() = default; - SysExecEvent_ClearSavingLoadingFlag() { } - SysExecEvent_ClearSavingLoadingFlag *Clone() const { return new SysExecEvent_ClearSavingLoadingFlag(); } - -protected: - void InvokeEvent() - { - IsSavingOrLoading = false; - UI_UpdateSysControls(); - } -}; - -void States_FreezeCurrentSlot() -{ - // FIXME : Use of the IsSavingOrLoading flag is mostly a hack until we implement a - // complete thread to manage queuing savestate tasks, and zipping states to disk. --air - if (!SysHasValidState()) - { - Console.WriteLn("Save state: Aborting (VM is not active)."); - return; - } - - if (wxGetApp().HasPendingSaves() || IsSavingOrLoading.exchange(true)) - { - Console.WriteLn("Load or save action is already pending."); - return; - } - - StateCopy_SaveToSlot(StatesC); - -#ifdef USE_NEW_SAVESLOTS_UI - saveslot_cache[StatesC].Used(); -#endif - - GetSysExecutorThread().PostIdleEvent(SysExecEvent_ClearSavingLoadingFlag()); - - States_updateLoadBackupMenuItem(); -} - -void _States_DefrostCurrentSlot(bool isFromBackup) -{ - if (!SysHasValidState()) - { - Console.WriteLn("Load state: Aborting (VM is not active)."); - return; - } - - if (IsSavingOrLoading.exchange(true)) - { - Console.WriteLn("Load or save action is already pending."); - return; - } - - StateCopy_LoadFromSlot(StatesC, isFromBackup); - - GetSysExecutorThread().PostIdleEvent(SysExecEvent_ClearSavingLoadingFlag()); - - States_updateLoadBackupMenuItem(); -} - -void States_DefrostCurrentSlot() -{ - _States_DefrostCurrentSlot(false); -} - -void States_DefrostCurrentSlotBackup() -{ - _States_DefrostCurrentSlot(true); -} - -void States_updateLoadBackupMenuItem() -{ - wxString file(StringUtil::UTF8StringToWxString(SaveStateBase::GetSavestateFolder(StatesC) + ".backup")); - - sMainFrame.EnableMenuItem(MenuId_State_LoadBackup, wxFileExists(file)); - sMainFrame.SetMenuItemLabel(MenuId_State_LoadBackup, wxsFormat(L"%s %d", _("Backup"), StatesC)); -} - -static void OnSlotChanged() -{ - OSDlog(Color_StrongGreen, true, " > Selected savestate slot %d", StatesC); - States_updateLoadBackupMenuItem(); -} - -int States_GetCurrentSlot() -{ - return StatesC; -} - -void States_SetCurrentSlot(int slot_num) -{ - StatesC = std::min(std::max(slot_num, 0), StateSlotsCount); - for (Saveslot& slot : saveslot_cache) - { - sMainFrame.CheckMenuItem(slot.load_item_id, slot.slot_num == slot_num); - sMainFrame.CheckMenuItem(slot.save_item_id, slot.slot_num == slot_num); - } - OnSlotChanged(); -} - -void States_CycleSlotForward() -{ - States_SetCurrentSlot((StatesC + 1) % StateSlotsCount); -} - -void States_CycleSlotBackward() -{ - States_SetCurrentSlot((StatesC + StateSlotsCount - 1) % StateSlotsCount); -} diff --git a/pcsx2/gui/Saveslots.h b/pcsx2/gui/Saveslots.h deleted file mode 100644 index 8a848b4cf1..0000000000 --- a/pcsx2/gui/Saveslots.h +++ /dev/null @@ -1,137 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2018 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - - -#pragma once - -#include "System.h" -#include "Elfheader.h" -#include "App.h" -#include "common/StringUtil.h" -#include - -// Uncomment to turn on the new saveslot UI. -#define USE_NEW_SAVESLOTS_UI - -// Uncomment to turn on the extra UI updates *without* the UI. -//#define USE_SAVESLOT_UI_UPDATES - -#ifdef USE_NEW_SAVESLOTS_UI -// Should always be enabled if the new saveslots are. -#define USE_SAVESLOT_UI_UPDATES -#endif - -#ifdef USE_SAVESLOT_UI_UPDATES -// Uncomment to add saveslot logging and comment to turn off. -//#define SAVESLOT_LOGS -#endif - -extern std::string DiscSerial; -static const int StateSlotsCount = 10; - -class Saveslot -{ -public: - int slot_num; - bool empty; - wxDateTime updated; - u32 crc; - wxString serialName; - bool menu_update, invalid_cache; - int load_item_id, save_item_id; - - Saveslot() = delete; - - Saveslot(int i) - { - slot_num = i; - empty = true; - updated = wxInvalidDateTime; - crc = 0; - serialName = L""; - menu_update = false; - invalid_cache = true; - load_item_id = MenuId_State_Load01 + i + 1; - save_item_id = MenuId_State_Save01 + i + 1; - } - - bool isUsed() - { - return wxFileExists(StringUtil::UTF8StringToWxString(SaveStateBase::GetSavestateFolder(slot_num, false))); - } - - wxDateTime GetTimestamp() - { - if (!isUsed()) return wxInvalidDateTime; - - return wxDateTime(wxFileModificationTime(StringUtil::UTF8StringToWxString(SaveStateBase::GetSavestateFolder(slot_num, false)))); - } - - void UpdateCache() - { - empty = !isUsed(); - updated = GetTimestamp(); - crc = ElfCRC; - serialName = StringUtil::UTF8StringToWxString(DiscSerial); - invalid_cache = false; - } - - wxString SlotName() - { - if (empty) return wxsFormat(_("Slot %d - Empty"), slot_num); - - if (updated.IsValid()) return wxsFormat(_("Slot %d - %s %s"), slot_num, updated.FormatDate(), updated.FormatTime()); - - return wxsFormat(_("Slot %d - Unknown Time"), slot_num); - } - - void ConsoleDump() - { - Console.WriteLn("Slot %i information:", slot_num); - Console.WriteLn("Internal CRC = %i; Current CRC = %i.", crc, ElfCRC); - if (empty) - Console.WriteLn("Slot cache says it is empty."); - else - Console.WriteLn("Slot cache says it is used."); - - if (updated != wxInvalidDateTime) - Console.WriteLn(wxsFormat(_("Write time is %s %s."), updated.FormatDate(), updated.FormatTime()).ToStdString()); - - //if (isUsed()) - // Console.WriteLn(wxsFormat(_("The disk has a file on it dated %s %s."), GetTimestamp().FormatDate(), GetTimestamp().FormatTime())); - } - - void Used() - { - // Update the saveslot cache with the new saveslot, and give it the current timestamp, - // Because we aren't going to be able to get the real timestamp from disk right now. - empty = false; - updated = wxDateTime::Now(); - crc = ElfCRC; - - // Update the slot next time we run through the UI update. - menu_update = true; - } -}; - -extern std::array saveslot_cache; -extern void States_DefrostCurrentSlotBackup(); -extern void States_DefrostCurrentSlot(); -extern void States_FreezeCurrentSlot(); -extern void States_CycleSlotForward(); -extern void States_CycleSlotBackward(); -extern void States_SetCurrentSlot(int slot_num); -extern int States_GetCurrentSlot(); -extern void States_updateLoadBackupMenuItem(); diff --git a/pcsx2/gui/StringHelpers.cpp b/pcsx2/gui/StringHelpers.cpp deleted file mode 100644 index 2a5dfde57c..0000000000 --- a/pcsx2/gui/StringHelpers.cpp +++ /dev/null @@ -1,246 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include // for wxPoint/wxRect stuff -#include "common/Exceptions.h" -#include "common/StringUtil.h" -#include "common/Pcsx2Defs.h" -#include "PersistentThread.h" -#include "StringHelpers.h" - -__fi wxString fromUTF8(const char* src) -{ - // IMPORTANT: We cannot use wxString::FromUTF8 because it *stupidly* relies on a C++ global instance of - // wxMBConvUTF8(). C++ initializes and destroys these globals at random, so any object constructor or - // destructor that attempts to do logging may crash the app (either during startup or during exit) unless - // we use a LOCAL instance of wxMBConvUTF8(). --air - - // Performance? No worries. wxMBConvUTF8() is virtually free. Initializing a stack copy of the class - // is just as efficient as passing a pointer to a pre-instanced global. (which makes me wonder wh wxWidgets - // uses the stupid globals in the first place!) --air - - return wxString(src, wxMBConvUTF8()); -} - -__fi wxString fromUTF8(const std::string& str) -{ - return wxString(str.data(), wxMBConvUTF8(), str.size()); -} - -__fi wxString fromAscii(const char* src) -{ - return wxString::FromAscii(src); -} - -// Splits a string into parts and adds the parts into the given SafeList. -// This list is not cleared, so concatenating many splits into a single large list is -// the 'default' behavior, unless you manually clear the SafeList prior to subsequent calls. -// -// Note: wxWidgets 2.9 / 3.0 has a wxSplit function, but we're using 2.8 so I had to make -// my own. -void SplitString(wxArrayString& dest, const wxString& src, const wxString& delims, wxStringTokenizerMode mode) -{ - wxStringTokenizer parts(src, delims, mode); - while (parts.HasMoreTokens()) - dest.Add(parts.GetNextToken()); -} - -// Joins a list of strings into one larger string, using the given string concatenation -// character as a separator. If you want to be able to split the string later then the -// concatenation string needs to be a single character. -// -// Note: wxWidgets 2.9 / 3.0 has a wxJoin function, but we're using 2.8 so I had to make -// my own. -wxString JoinString(const wxArrayString& src, const wxString& separator) -{ - wxString dest; - for (int i = 0, len = src.GetCount(); i < len; ++i) - { - if (src[i].IsEmpty()) - continue; - if (!dest.IsEmpty()) - dest += separator; - dest += src[i]; - } - return dest; -} - -wxString JoinString(const wxChar** src, const wxString& separator) -{ - wxString dest; - while (*src != NULL) - { - if (*src[0] == 0) - continue; - - if (!dest.IsEmpty()) - dest += separator; - dest += *src; - ++src; - } - return dest; -} - - -// Attempts to parse and return a value for the given template type, and throws a ParseError -// exception if the parse fails. The template type can be anything that is supported/ -// implemented via one of the TryParse() method overloads. -// -// This, so far, include types such as wxPoint, wxRect, and wxSize. -// -template -T Parse(const wxString& src, const wxString& separators = L",") -{ - T retval; - if (!TryParse(retval, src, separators)) - throw Exception::ParseError(StringUtil::StdStringFromFormat("Parse failure on call to %s: %ls", __WXFUNCTION__, WX_STR(src))); - return retval; -} - - -// -------------------------------------------------------------------------------------- -// ToString helpers for wxString! -// -------------------------------------------------------------------------------------- - -// Converts a wxPoint into a comma-delimited string! -wxString ToString(const wxPoint& src, const wxString& separator) -{ - return wxString() << src.x << separator << src.y; -} - -wxString ToString(const wxSize& src, const wxString& separator) -{ - return wxString() << src.GetWidth() << separator << src.GetHeight(); -} - -// Converts a wxRect into a comma-delimited string! -// Example: 32,64,128,5 -wxString ToString(const wxRect& src, const wxString& separator) -{ - return ToString(src.GetLeftTop(), separator) << separator << ToString(src.GetSize(), separator); -} - -// -------------------------------------------------------------------------------------- -// Parse helpers for wxString! -// -------------------------------------------------------------------------------------- - -bool TryParse(wxPoint& dest, wxStringTokenizer& parts) -{ - long result[2]; - - if (!parts.HasMoreTokens() || !parts.GetNextToken().ToLong(&result[0])) - return false; - if (!parts.HasMoreTokens() || !parts.GetNextToken().ToLong(&result[1])) - return false; - dest.x = result[0]; - dest.y = result[1]; - - return true; -} - -bool TryParse(wxSize& dest, wxStringTokenizer& parts) -{ - long result[2]; - - if (!parts.HasMoreTokens() || !parts.GetNextToken().ToLong(&result[0])) - return false; - if (!parts.HasMoreTokens() || !parts.GetNextToken().ToLong(&result[1])) - return false; - dest.SetWidth(result[0]); - dest.SetHeight(result[1]); - - return true; -} - -// Tries to parse the given string into a wxPoint value at 'dest.' If the parse fails, the -// method aborts and returns false. -bool TryParse(wxPoint& dest, const wxString& src, const wxPoint& defval, const wxString& separators) -{ - dest = defval; - wxStringTokenizer parts(src, separators); - return TryParse(dest, parts); -} - -bool TryParse(wxSize& dest, const wxString& src, const wxSize& defval, const wxString& separators) -{ - dest = defval; - wxStringTokenizer parts(src, separators); - return TryParse(dest, parts); -} - -bool TryParse(wxRect& dest, const wxString& src, const wxRect& defval, const wxString& separators) -{ - dest = defval; - - wxStringTokenizer parts(src, separators); - - wxPoint point; - wxSize size; - - if (!TryParse(point, parts)) - return false; - if (!TryParse(size, parts)) - return false; - - dest = wxRect(point, size); - return true; -} - -// Performs a cross-platform puts operation, which adds CRs to naked LFs on Win32 platforms, -// so that Notepad won't throw a fit and Rama can read the logs again! On Unix and Mac platforms, -// the input string is written unmodified. -// -// PCSX2 generally uses Unix-style newlines -- LF (\n) only -- hence there's no need to strip CRs -// from incoming data. Mac platforms may need an implementation of their own that converts -// newlines to CRs...? -// -void px_fputs(FILE* fp, const char* src) -{ - if (fp == NULL) - return; - -#ifdef _WIN32 - // Windows needs CR's partnered with all newlines, or else notepad.exe can't view - // the stupid logfile. Best way is to write one char at a time.. >_< - - const char* curchar = src; - bool prevcr = false; - while (*curchar != 0) - { - if (*curchar == '\r') - { - prevcr = true; - } - else - { - // Only write a CR/LF pair if the current LF is not prefixed nor - // post-fixed by a CR. - if (*curchar == '\n' && !prevcr && (*(curchar + 1) != '\r')) - fputs("\r\n", fp); - else - fputc(*curchar, fp); - - prevcr = false; - } - ++curchar; - } - -#else - // Linux is happy with plain old LFs. Not sure about Macs... does OSX still - // go by the old school Mac style of using Crs only? - - fputs(src, fp); // fputs does not do automatic newlines, so it's ok! -#endif -} diff --git a/pcsx2/gui/StringHelpers.h b/pcsx2/gui/StringHelpers.h deleted file mode 100644 index 274b230d43..0000000000 --- a/pcsx2/gui/StringHelpers.h +++ /dev/null @@ -1,253 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include -#include -#include "common/Pcsx2Defs.h" -#include "common/SafeArray.h" -#include "common/AlignedMalloc.h" - -// This should prove useful.... -#define wxsFormat wxString::Format - -#define WX_STR(str) ((str).wc_str()) - -extern void px_fputs(FILE* fp, const char* src); - -// wxWidgets lacks one of its own... -extern const wxRect wxDefaultRect; - -extern void SplitString(wxArrayString& dest, const wxString& src, const wxString& delims, wxStringTokenizerMode mode = wxTOKEN_RET_EMPTY_ALL); -extern wxString JoinString(const wxArrayString& src, const wxString& separator); -extern wxString JoinString(const wxChar** src, const wxString& separator); - -extern wxString ToString(const wxPoint& src, const wxString& separator = L","); -extern wxString ToString(const wxSize& src, const wxString& separator = L","); -extern wxString ToString(const wxRect& src, const wxString& separator = L","); - -extern bool TryParse(wxPoint& dest, const wxStringTokenizer& parts); -extern bool TryParse(wxSize& dest, const wxStringTokenizer& parts); - -extern bool TryParse(wxPoint& dest, const wxString& src, const wxPoint& defval = wxDefaultPosition, const wxString& separators = L","); -extern bool TryParse(wxSize& dest, const wxString& src, const wxSize& defval = wxDefaultSize, const wxString& separators = L","); -extern bool TryParse(wxRect& dest, const wxString& src, const wxRect& defval = wxDefaultRect, const wxString& separators = L","); - - -// ====================================================================================== -// FastFormatAscii / FastFormatUnicode (overview!) -// ====================================================================================== -// Fast formatting of ASCII or Unicode text. These classes uses a series of thread-local -// format buffers that are allocated only once and grown to accommodate string formatting -// needs. Because the buffers are thread-local, no thread synch objects are required in -// order to format strings, allowing for multi-threaded string formatting operations to be -// performed with maximum efficiency. This class also reduces the overhead typically required -// to allocate string buffers off the heap. -// -// Drawbacks: -// * Some overhead is added to the creation and destruction of threads, however since thread -// construction is a typically slow process, and often avoided to begin with, this should -// be a sound trade-off. -// -// Notes: -// * conversion to wxString requires a heap allocation. -// * FastFormatUnicode can accept either UTF8 or UTF16/32 (wchar_t) input, but FastFormatAscii -// accepts Ascii/UTF8 only. -// - -typedef AlignedBuffer CharBufferType; -// -------------------------------------------------------------------------------------- -// FastFormatAscii -// -------------------------------------------------------------------------------------- - -class FastFormatAscii -{ -protected: - CharBufferType m_dest; - -public: - FastFormatAscii(); - ~FastFormatAscii() = default; - FastFormatAscii& Write(const char* fmt, ...); - FastFormatAscii& WriteV(const char* fmt, va_list argptr); - - void Clear(); - bool IsEmpty() const; - - const char* c_str() const { return m_dest.GetPtr(); } - operator const char*() const { return m_dest.GetPtr(); } - - const wxString GetString() const; - //operator wxString() const; - - FastFormatAscii& operator+=(const wxString& s) - { - Write("%s", WX_STR(s)); - return *this; - } - - FastFormatAscii& operator+=(const wxChar* psz) - { - Write("%ls", psz); - return *this; - } - - FastFormatAscii& operator+=(const char* psz) - { - Write("%s", psz); - return *this; - } -}; - -// -------------------------------------------------------------------------------------- -// FastFormatUnicode -// -------------------------------------------------------------------------------------- -class FastFormatUnicode -{ -protected: - CharBufferType m_dest; - uint m_Length; - -public: - FastFormatUnicode(); - ~FastFormatUnicode() = default; - - FastFormatUnicode& Write(const char* fmt, ...); - FastFormatUnicode& Write(const wxChar* fmt, ...); - FastFormatUnicode& Write(const wxString fmt, ...); - FastFormatUnicode& WriteV(const char* fmt, va_list argptr); - FastFormatUnicode& WriteV(const wxChar* fmt, va_list argptr); - - void Clear(); - bool IsEmpty() const; - uint Length() const { return m_Length; } - - FastFormatUnicode& ToUpper(); - FastFormatUnicode& ToLower(); - - const wxChar* c_str() const { return (const wxChar*)m_dest.GetPtr(); } - operator const wxChar*() const { return (const wxChar*)m_dest.GetPtr(); } - operator wxString() const { return (const wxChar*)m_dest.GetPtr(); } - - FastFormatUnicode& operator+=(const wxString& s) - { - Write(L"%s", WX_STR(s)); - return *this; - } - - FastFormatUnicode& operator+=(const wxChar* psz) - { - Write(L"%s", psz); - return *this; - } - - FastFormatUnicode& operator+=(const char* psz); - - wxScopedCharBuffer ToUTF8() const { return wxString(m_dest.GetPtr()).ToUTF8(); } - std::string ToStdString() const { return wxString(m_dest.GetPtr()).ToStdString(); } -}; - -#define pxsFmt FastFormatUnicode().Write -#define pxsFmtV FastFormatUnicode().WriteV -#define pxsPtr(ptr) pxsFmt("0x%016" PRIXPTR, (ptr)).c_str() - -extern wxString& operator+=(wxString& str1, const FastFormatUnicode& str2); -extern wxString operator+(const wxString& str1, const FastFormatUnicode& str2); -extern wxString operator+(const wxChar* str1, const FastFormatUnicode& str2); -extern wxString operator+(const FastFormatUnicode& str1, const wxString& str2); -extern wxString operator+(const FastFormatUnicode& str1, const wxChar* str2); - -extern wxString fromUTF8(const std::string& str); -extern wxString fromUTF8(const char* src); -extern wxString fromAscii(const char* src); - - -// -------------------------------------------------------------------------------------- -// _(x) / _t(x) / _d(x) / pxL(x) / pxLt(x) [macros] -// -------------------------------------------------------------------------------------- -// Define pxWex's own i18n helpers. These override the wxWidgets helpers and provide -// additional functionality. Define them FIRST THING, to make sure that wx's own gettext -// macros aren't in place. -// -// _ is for standard translations -// _t is for tertiary low priority translations -// _d is for debug/devel build translations - -#define WXINTL_NO_GETTEXT_MACRO - -#ifndef _ -#define _(s) pxGetTranslation(_T(s)) -#endif - -#ifndef _t -#define _t(s) pxGetTranslation(_T(s)) -#endif - -#ifndef _d -#define _d(s) pxGetTranslation(_T(s)) -#endif - -// pxL / pxLt / pxDt -- macros provided for tagging translation strings, without actually running -// them through the translator (which the _() does automatically, and sometimes we don't -// want that). This is a shorthand replacement for wxTRANSLATE. pxL is a standard translation -// moniker. pxLt is for tertiary strings that have a very low translation priority. pxDt is for -// debug/devel specific translations. -// -#ifndef pxL -#define pxL(a) wxT(a) -#endif - -#ifndef pxLt -#define pxLt(a) wxT(a) -#endif - -#ifndef pxDt -#define pxDt(a) wxT(a) -#endif - -// -------------------------------------------------------------------------------------- -// pxE(msg) and pxEt(msg) [macros] => now same as _/_t/_d -// -------------------------------------------------------------------------------------- -#define pxE(english) pxExpandMsg((english)) - -// For use with tertiary translations (low priority). -#define pxEt(english) pxExpandMsg((english)) - -// For use with Dev/debug build translations (low priority). -#define pxE_dev(english) pxExpandMsg((english)) - - -extern const wxChar* pxExpandMsg(const wxChar* message); -extern const wxChar* pxGetTranslation(const wxChar* message); -extern bool pxIsEnglish(int id); - -namespace StringUtil -{ - /// Converts a wxString to a UTF-8 std::string. - static inline std::string wxStringToUTF8String(const wxString& str) - { - const wxScopedCharBuffer buf(str.ToUTF8()); - return std::string(buf.data(), buf.length()); - } - - /// Converts a UTF-8 std::string to a wxString. - static inline wxString UTF8StringToWxString(const std::string_view& str) - { - return wxString::FromUTF8(str.data(), str.length()); - } -} diff --git a/pcsx2/gui/SysCoreThread.cpp b/pcsx2/gui/SysCoreThread.cpp deleted file mode 100644 index 4a62792fd5..0000000000 --- a/pcsx2/gui/SysCoreThread.cpp +++ /dev/null @@ -1,390 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Common.h" -#include "gui/App.h" -#include "IopBios.h" -#include "R5900.h" - -#include "common/Timer.h" -#include "common/WindowInfo.h" -extern WindowInfo g_gs_window_info; - -#include "Counters.h" -#include "GS.h" -#include "Elfheader.h" -#include "Patch.h" -#include "SysThreads.h" -#include "MTVU.h" -#include "PINE.h" -#include "FW.h" -#include "SPU2/spu2.h" -#include "DEV9/DEV9.h" -#include "USB/USBNull.h" -#include "MemoryCardFile.h" -#include "PAD/Gamepad.h" -#include "PerformanceMetrics.h" - -#include "DebugTools/MIPSAnalyst.h" -#include "DebugTools/SymbolMap.h" - -#include "common/PageFaultSource.h" -#include "common/Threading.h" -#include "IopBios.h" - -#ifdef __WXMSW__ -#include -#endif - -#include "common/emitter/x86_intrin.h" - -bool g_CDVDReset = false; - -namespace PINESettings -{ - unsigned int slot = PINE_DEFAULT_SLOT; -}; - -// -------------------------------------------------------------------------------------- -// SysCoreThread *External Thread* Implementations -// (Called from outside the context of this thread) -// -------------------------------------------------------------------------------------- - -SysCoreThread::SysCoreThread() - : m_hasActiveMachine(false) -{ - m_name = L"EE Core"; - m_resetRecompilers = true; - m_resetProfilers = true; - m_resetVsyncTimers = true; - m_resetVirtualMachine = true; -} - -SysCoreThread::~SysCoreThread() -{ - try - { - SysCoreThread::Cancel(); - } - DESTRUCTOR_CATCHALL -} - -void SysCoreThread::Cancel(bool isBlocking) -{ - m_hasActiveMachine = false; - R3000A::ioman::reset(); - _parent::Cancel(); -} - -bool SysCoreThread::Cancel(const wxTimeSpan& span) -{ - m_hasActiveMachine = false; - R3000A::ioman::reset(); - return _parent::Cancel(span); -} - -void SysCoreThread::OnStart() -{ - _parent::OnStart(); -} - -void SysCoreThread::OnSuspendInThread() -{ - // We deliberately don't tear down GS here, because the state isn't saved. - // Which means when it reopens, you'll lose everything in VRAM. Anything - // which needs GS to be torn down should manually save its state. - TearDownSystems(static_cast(-1 & ~System_GS)); // All systems -} - -void SysCoreThread::Start() -{ - SPU2init(); - PADinit(); - DEV9init(); - USBinit(); - _parent::Start(); -} - -// Resumes the core execution state, or does nothing is the core is already running. If -// settings were changed, resets will be performed as needed and emulation state resumed from -// memory savestates. -// -// Exceptions (can occur on first call only): -// ThreadCreationError - Insufficient system resources to create thread. -// -void SysCoreThread::OnResumeReady() -{ - if (m_resetVirtualMachine) - m_hasActiveMachine = false; - - if (!m_hasActiveMachine) - m_resetRecompilers = true; -} - -// This function *will* reset the emulator in order to allow the specified elf file to -// take effect. This is because it really doesn't make sense to change the elf file outside -// the context of a reset/restart. -void SysCoreThread::SetElfOverride(const wxString& elf) -{ - //pxAssertDev( !m_hasValidMachine, "Thread synchronization error while assigning ELF override." ); - m_elf_override = elf; - - - Hle_SetElfPath(elf.ToUTF8()); -} - -// Performs a quicker reset that does not deallocate memory associated with PS2 virtual machines -// or cpu providers (recompilers). -void SysCoreThread::ResetQuick() -{ - Suspend(); - - m_resetVirtualMachine = true; - m_hasActiveMachine = false; - R3000A::ioman::reset(); -} - -void SysCoreThread::Reset() -{ - ResetQuick(); - SysClearExecutionCache(); - sApp.PostAppMethod(&Pcsx2App::leaveDebugMode); - g_FrameCount = 0; -} - - -// Applies a full suite of new settings, which will automatically facilitate the necessary -// resets of the core and components. The scope of resetting -// is determined by comparing the current settings against the new settings, so that only -// real differences are applied. -void SysCoreThread::ApplySettings(const Pcsx2Config& src) -{ - if (src == EmuConfig) - return; - - if (!pxAssertDev(IsPaused() | IsSelf(), "CoreThread is not paused; settings cannot be applied.")) - return; - - m_resetRecompilers = (src.Cpu != EmuConfig.Cpu) || (src.Gamefixes != EmuConfig.Gamefixes) || (src.Speedhacks != EmuConfig.Speedhacks); - m_resetProfilers = (src.Profiler != EmuConfig.Profiler); - m_resetVsyncTimers = (src.GS != EmuConfig.GS); - - const bool gs_settings_changed = !src.GS.OptionsAreEqual(EmuConfig.GS); - - Pcsx2Config old_config; - old_config.CopyConfig(EmuConfig); - EmuConfig.CopyConfig(src); - - // handle DEV9 setting changes - DEV9CheckChanges(old_config); - - // handle GS setting changes - if (GetMTGS().IsOpen() && gs_settings_changed) - { - Console.WriteLn("Applying GS settings..."); - GetMTGS().ApplySettings(); - GetMTGS().UpdateVSyncMode(); - } -} - -// -------------------------------------------------------------------------------------- -// SysCoreThread *Worker* Implementations -// (Called from the context of this thread only) -// -------------------------------------------------------------------------------------- -bool SysCoreThread::HasPendingStateChangeRequest() const -{ - return !m_hasActiveMachine || _parent::HasPendingStateChangeRequest(); -} - -void SysCoreThread::_reset_stuff_as_needed() -{ - // Note that resetting recompilers along with the virtual machine is only really needed - // because of changes to the TLB. We don't actually support the TLB, however, so rec - // resets aren't in fact *needed* ... yet. But might as well, no harm. --air - - if (m_resetVirtualMachine || m_resetRecompilers || m_resetProfilers) - { - SysClearExecutionCache(); - memBindConditionalHandlers(); - SetCPUState(EmuConfig.Cpu.sseMXCSR, EmuConfig.Cpu.sseVUMXCSR); - - m_resetRecompilers = false; - m_resetProfilers = false; - } - - if (m_resetVirtualMachine) - { - DoCpuReset(); - - m_resetVirtualMachine = false; - m_resetVsyncTimers = false; - - ForgetLoadedPatches(); - } - - if (m_resetVsyncTimers) - { - GetMTGS().UpdateVSyncMode(); - UpdateVSyncRate(); - frameLimitReset(); - - m_resetVsyncTimers = false; - } -} - -void SysCoreThread::DoCpuReset() -{ - AffinityAssert_AllowFromSelf(pxDiagSpot); - cpuReset(); -} - -// This is called from the PS2 VM at the start of every vsync (either 59.94 or 50 hz by PS2 -// clock scale, which does not correlate to the actual host machine vsync). -// -// Default tasks: Updates PADs and applies vsync patches. Derived classes can override this -// to change either PAD and/or Patching behaviors. -// -// [TODO]: Should probably also handle profiling and debugging updates, once those are -// re-implemented. -// -void SysCoreThread::VsyncInThread() -{ - ApplyLoadedPatches(PPT_CONTINUOUSLY); - ApplyLoadedPatches(PPT_COMBINED_0_1); -} - -void SysCoreThread::GameStartingInThread() -{ - GetMTGS().SendGameCRC(ElfCRC); - - MIPSAnalyst::ScanForFunctions(R5900SymbolMap, ElfTextRange.first, ElfTextRange.first + ElfTextRange.second, true); - R5900SymbolMap.UpdateActiveSymbols(); - R3000SymbolMap.UpdateActiveSymbols(); - sApp.PostAppMethod(&Pcsx2App::resetDebugger); - - ApplyLoadedPatches(PPT_ONCE_ON_LOAD); - ApplyLoadedPatches(PPT_COMBINED_0_1); -#ifdef USE_SAVESLOT_UI_UPDATES - UI_UpdateSysControls(); -#endif - if (EmuConfig.EnablePINE && m_PineState == OFF) - { - m_PineState = ON; - m_pineServer = std::make_unique(this, PINESettings::slot); - } - if (m_PineState == ON && m_pineServer->m_end) - m_pineServer->Start(); -} - -bool SysCoreThread::StateCheckInThread() -{ - return _parent::StateCheckInThread() && (_reset_stuff_as_needed(), true); -} - -// Runs CPU cycles indefinitely, until the user or another thread requests execution to break. -// Rationale: This very short function allows an override point and solves an SEH -// "exception-type boundary" problem (can't mix SEH and C++ exceptions in the same function). -void SysCoreThread::DoCpuExecute() -{ - m_hasActiveMachine = true; - UI_EnableSysActions(); - Cpu->Execute(); -} - -void SysCoreThread::ExecuteTaskInThread() -{ - Threading::EnableHiresScheduler(); // Note that *something* in SPU2 and GS also set the timer resolution to 1ms. - m_sem_event.WaitForWork(); - - m_mxcsr_saved.bitmask = _mm_getcsr(); - - PCSX2_PAGEFAULT_PROTECT - { - while (true) - { - StateCheckInThread(); - DoCpuExecute(); - } - } - PCSX2_PAGEFAULT_EXCEPT; -} - -void SysCoreThread::TearDownSystems(SystemsMask systemsToTearDown) -{ - if (systemsToTearDown & System_DEV9) DEV9close(); - if (systemsToTearDown & System_USB) USBclose(); - if (systemsToTearDown & System_CDVD) DoCDVDclose(); - if (systemsToTearDown & System_FW) FWclose(); - if (systemsToTearDown & System_PAD) PADclose(); - if (systemsToTearDown & System_SPU2) SPU2close(); - if (systemsToTearDown & System_MCD) FileMcd_EmuClose(); - - if (GetMTGS().IsOpen()) - GetMTGS().WaitGS(); - - PerformanceMetrics::SetCPUThread(Threading::ThreadHandle()); -} - -void SysCoreThread::OnResumeInThread(SystemsMask systemsToReinstate) -{ - PerformanceMetrics::SetCPUThread(Threading::ThreadHandle::GetForCallingThread()); - PerformanceMetrics::Reset(); - - // if GS is open, wait for it to finish (could be applying settings) - if (GetMTGS().IsOpen()) - GetMTGS().WaitGS(); - else - GetMTGS().WaitForOpen(); - - if (systemsToReinstate & System_DEV9) DEV9open(); - if (systemsToReinstate & System_USB) USBopen(g_gs_window_info); - if (systemsToReinstate & System_FW) FWopen(); - if (systemsToReinstate & System_SPU2) SPU2open(); - if (systemsToReinstate & System_PAD) PADopen(g_gs_window_info); - if (systemsToReinstate & System_MCD) FileMcd_EmuOpen(); -} - - -// Invoked by the pthread_exit or pthread_cancel. -void SysCoreThread::OnCleanupInThread() -{ - m_ExecMode = ExecMode_Closing; - - m_hasActiveMachine = false; - m_resetVirtualMachine = true; - - R3000A::ioman::reset(); - vu1Thread.Close(); - USBclose(); - SPU2close(); - PADclose(); - DEV9close(); - DoCDVDclose(); - FWclose(); - FileMcd_EmuClose(); - GetMTGS().WaitForClose(); - USBshutdown(); - SPU2shutdown(); - PADshutdown(); - DEV9shutdown(); - GetMTGS().ShutdownThread(); - - _mm_setcsr(m_mxcsr_saved.bitmask); - Threading::DisableHiresScheduler(); - _parent::OnCleanupInThread(); - - m_ExecMode = ExecMode_NoThreadYet; -} diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp deleted file mode 100644 index ccb33980fb..0000000000 --- a/pcsx2/gui/SysState.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "MemoryTypes.h" -#include "App.h" - -#include "SysThreads.h" -#include "SaveState.h" -#include "VUmicro.h" - -#include "common/StringUtil.h" -#include "SPU2/spu2.h" -#include "USB/USBNull.h" -#include "PAD/Gamepad.h" - -#include "ConsoleLogger.h" - -#include -#include - -#include "Patch.h" - -// Required for savestate folder creation -#include "CDVD/CDVD.h" -#include "ps2/BiosTools.h" -#include "Elfheader.h" - -class SysExecEvent_SaveState : public SysExecEvent -{ -protected: - wxString m_filename; - -public: - wxString GetEventName() const { return L"VM_Download"; } - - SysExecEvent_SaveState(const wxString& filename) : m_filename(filename) {} - virtual ~SysExecEvent_SaveState() = default; - - SysExecEvent_SaveState* Clone() const { return new SysExecEvent_SaveState(*this); } - - bool IsCriticalEvent() const { return true; } - bool AllowCancelOnExit() const { return false; } - -protected: - void InvokeEvent() - { - ScopedCoreThreadPause paused_core; - std::unique_ptr elist = SaveState_DownloadState(); - UI_EnableStateActions(); - paused_core.AllowResume(); - - std::thread kickoff(&SysExecEvent_SaveState::ZipThreadProc, - std::move(elist), StringUtil::wxStringToUTF8String(m_filename)); - kickoff.detach(); - } - - static void ZipThreadProc(std::unique_ptr elist, std::string filename) - { - wxGetApp().StartPendingSave(); - if (SaveState_ZipToDisk(std::move(elist), nullptr, filename.c_str())) - Console.WriteLn("(gzipThread) Data saved to disk without error."); - else - Console.Error("Failed to zip state to '%s'", filename.c_str()); - wxGetApp().ClearPendingSave(); - } -}; - -// -------------------------------------------------------------------------------------- -// SysExecEvent_UnzipFromDisk -// -------------------------------------------------------------------------------------- -// Note: Unzipping always goes directly into the SysCoreThread's static VM state, and is -// always a blocking action on the SysExecutor thread (the system cannot execute other -// commands while states are unzipping or uploading into the system). -// -class SysExecEvent_UnzipFromDisk : public SysExecEvent -{ -protected: - wxString m_filename; - -public: - wxString GetEventName() const { return L"VM_UnzipFromDisk"; } - - virtual ~SysExecEvent_UnzipFromDisk() = default; - SysExecEvent_UnzipFromDisk* Clone() const { return new SysExecEvent_UnzipFromDisk(*this); } - SysExecEvent_UnzipFromDisk(const wxString& filename) - : m_filename(filename) - { - } - - wxString GetStreamName() const { return m_filename; } - -protected: - void InvokeEvent() - { - // We use direct Suspend/Resume control here, since it's desirable that emulation - // *ALWAYS* start execution after the new savestate is loaded. - GetCoreThread().Pause({}); - SaveState_UnzipFromDisk(StringUtil::wxStringToUTF8String(m_filename)); - GetCoreThread().Resume(); // force resume regardless of emulation state earlier. - } -}; - -// ===================================================================================================== -// StateCopy Public Interface -// ===================================================================================================== - -void StateCopy_SaveToFile(const wxString& file) -{ - UI_DisableStateActions(); - GetSysExecutorThread().PostEvent(new SysExecEvent_SaveState(file)); -} - -void StateCopy_LoadFromFile(const wxString& file) -{ - UI_DisableSysActions(); - GetSysExecutorThread().PostEvent(new SysExecEvent_UnzipFromDisk(file)); -} - -// Saves recovery state info to the given saveslot, or saves the active emulation state -// (if one exists) and no recovery data was found. This is needed because when a recovery -// state is made, the emulation state is usually reset so the only persisting state is -// the one in the memory save. :) -void StateCopy_SaveToSlot(uint num) -{ - const wxString file(StringUtil::UTF8StringToWxString(SaveStateBase::GetSavestateFolder(num, true))); - - // Backup old Savestate if one exists. - if (wxFileExists(file) && EmuConfig.BackupSavestate) - { - const wxString copy(StringUtil::UTF8StringToWxString(SaveStateBase::GetSavestateFolder(num, true)) + pxsFmt(L".backup")); - - Console.Indent().WriteLn(Color_StrongGreen, "Backing up existing state in slot %d.", num); - wxRenameFile(file, copy); - } - - OSDlog(Color_StrongGreen, true, "Saving savestate to slot %d...", num); - Console.Indent().WriteLn(Color_StrongGreen, "filename: %ls", WX_STR(file)); - - StateCopy_SaveToFile(file); -#ifdef USE_NEW_SAVESLOTS_UI - UI_UpdateSysControls(); -#endif -} - -void StateCopy_LoadFromSlot(uint slot, bool isFromBackup) -{ - wxString file(StringUtil::UTF8StringToWxString(SaveStateBase::GetSavestateFolder(slot, true)) + wxString(isFromBackup ? L".backup" : L"")); - - if (!wxFileExists(file)) - { - OSDlog(Color_StrongGreen, true, "Savestate slot %d%s is empty.", slot, isFromBackup ? " (backup)" : ""); - return; - } - - OSDlog(Color_StrongGreen, true, "Loading savestate from slot %d...%s", slot, isFromBackup ? " (backup)" : ""); - Console.Indent().WriteLn(Color_StrongGreen, "filename: %ls", WX_STR(file)); - - StateCopy_LoadFromFile(file); -#ifdef USE_NEW_SAVESLOTS_UI - UI_UpdateSysControls(); -#endif -} - diff --git a/pcsx2/gui/SysThreadBase.cpp b/pcsx2/gui/SysThreadBase.cpp deleted file mode 100644 index 4f3bcabb9b..0000000000 --- a/pcsx2/gui/SysThreadBase.cpp +++ /dev/null @@ -1,367 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "System.h" -#include "SysThreads.h" -#include "CDVD/CDVDcommon.h" - -// -------------------------------------------------------------------------------------- -// SysThreadBase *External Thread* Implementations -// (Called form outside the context of this thread) -// -------------------------------------------------------------------------------------- - -SysThreadBase::SysThreadBase() - : m_ExecMode(ExecMode_NoThreadYet) - , m_ExecModeMutex() -{ -} - -void SysThreadBase::Start() -{ - _parent::Start(); - - Sleep(1); - - pxAssertDev((m_ExecMode == ExecMode_Closing) || (m_ExecMode == ExecMode_Closed), - "Unexpected thread status during SysThread startup."); - - m_sem_event.NotifyOfWork(); -} - - -void SysThreadBase::OnStart() -{ - if (!pxAssertDev(m_ExecMode == ExecMode_NoThreadYet, "SysSustainableThread:Start(): Invalid execution mode")) - return; - - m_sem_Resume.Reset(); - m_sem_ChangingExecMode.Reset(); - - FrankenMutex(m_ExecModeMutex); - FrankenMutex(m_RunningLock); - - _parent::OnStart(); -} - -// Suspends emulation and closes the emulation state at the next PS2 vsync, -// and returns control to the calling thread; or does nothing if the core is already suspended. -// -// Parameters: -// isNonblocking - if set to true then the function will not block for emulation suspension. -// Defaults to false if parameter is not specified. Performing non-blocking suspension -// is mostly useful for starting certain non-Emu related gui activities (improves gui -// responsiveness). -// -// Returns: -// The previous suspension state; true if the thread was running or false if it was -// suspended. -// -// Exceptions: -// CancelEvent - thrown if the thread is already in a Paused or Closing state. Because -// actions that pause emulation typically rely on subcomponents remaining loaded/active, -// Suspension must cancel itself forcefully or risk crashing whatever other action is -// in progress. -// -void SysThreadBase::Suspend(bool isBlocking) -{ - if (!pxAssertDev(!IsSelf(), "Suspend/Resume are not allowed from this thread.")) - return; - if (!IsRunning()) - return; - - // shortcut ExecMode check to avoid deadlocking on redundant calls to Suspend issued - // from Resume or OnResumeReady code. - if (m_ExecMode == ExecMode_Closed) - return; - - { - ScopedLock locker(m_ExecModeMutex); - - switch (m_ExecMode.load()) - { - // Invalid thread state, nothing to suspend - case ExecMode_NoThreadYet: - // Check again -- status could have changed since above. - case ExecMode_Closed: - return; - - case ExecMode_Pausing: - case ExecMode_Paused: - if (!isBlocking) - throw Exception::CancelEvent("Cannot suspend in non-blocking fashion: Another thread is pausing the VM state."); - - m_ExecMode = ExecMode_Closing; - m_sem_Resume.Post(); - m_sem_ChangingExecMode.Wait(); - break; - - case ExecMode_Opened: - m_ExecMode = ExecMode_Closing; - break; - - case ExecMode_Closing: - break; - } - - pxAssertDev(m_ExecMode == ExecMode_Closing, "ExecMode should be nothing other than Closing..."); - m_sem_event.NotifyOfWork(); - } - - if (isBlocking) - m_RunningLock.Wait(); -} - -// Returns: -// The previous suspension state; true if the thread was running or false if it was -// closed, not running, or paused. -// -void SysThreadBase::Pause(SystemsMask systemsToTearDown, bool debug) -{ - if (IsSelf() || !IsRunning()) - return; - - // shortcut ExecMode check to avoid deadlocking on redundant calls to Suspend issued - // from Resume or OnResumeReady code. - if ((m_ExecMode == ExecMode_Closed) || (m_ExecMode == ExecMode_Paused)) - return; - - { - ScopedLock locker(m_ExecModeMutex); - - // Check again -- status could have changed since above. - if ((m_ExecMode == ExecMode_Closed) || (m_ExecMode == ExecMode_Paused)) - return; - - m_SystemsToTearDown.store(systemsToTearDown, std::memory_order_relaxed); - if (m_ExecMode == ExecMode_Opened) - m_ExecMode = ExecMode_Pausing; - - pxAssertDev(m_ExecMode == ExecMode_Pausing, "ExecMode should be nothing other than Pausing..."); - - if (debug) - OnPauseDebug(); - else - OnPause(); - m_sem_event.NotifyOfWork(); - } - - m_RunningLock.Wait(); -} - -void SysThreadBase::PauseSelf() -{ - if (!IsSelf() || !IsRunning()) - return; - - { - ScopedLock locker(m_ExecModeMutex); - - if (m_ExecMode == ExecMode_Opened) - m_ExecMode = ExecMode_Pausing; - - OnPause(); - m_sem_event.NotifyOfWork(); - } -} - -void SysThreadBase::PauseSelfDebug() -{ - if (!IsSelf() || !IsRunning()) - return; - - { - ScopedLock locker(m_ExecModeMutex); - - if (m_ExecMode == ExecMode_Opened) - m_ExecMode = ExecMode_Pausing; - - OnPauseDebug(); - m_sem_event.NotifyOfWork(); - } -} - -// Resumes the core execution state, or does nothing is the core is already running. If -// settings were changed, resets will be performed as needed and emulation state resumed from -// memory savestates. -// -// Note that this is considered a non-blocking action. Most times the state is safely resumed -// on return, but in the case of re-entrant or nested message handling the function may return -// before the thread has resumed. If you need explicit behavior tied to the completion of the -// Resume, you'll need to bind callbacks to either OnResumeReady or OnResumeInThread. -// -// Exceptions: -// ThreadCreationError - Insufficient system resources to create thread. -// -void SysThreadBase::Resume() -{ - if (IsSelf()) - return; - if (m_ExecMode == ExecMode_Opened) - return; - - ScopedLock locker(m_ExecModeMutex); - - // Implementation Note: - // The entire state coming out of a Wait is indeterminate because of user input - // and pending messages being handled. So after each call we do some seemingly redundant - // sanity checks against m_ExecMode/m_Running status, and if something doesn't feel - // right, we should abort; the user may have canceled the action before it even finished. - - switch (m_ExecMode.load()) - { - case ExecMode_Opened: - return; - - case ExecMode_NoThreadYet: - { - Start(); - if (!m_running || (m_ExecMode == ExecMode_NoThreadYet)) - throw Exception::ThreadCreationError(this); - if (m_ExecMode == ExecMode_Opened) - return; - } - [[fallthrough]]; - - case ExecMode_Closing: - case ExecMode_Pausing: - // we need to make sure and wait for the emuThread to enter a fully suspended - // state before continuing... - - m_RunningLock.Wait(); - if (!m_running) - return; - if ((m_ExecMode != ExecMode_Closed) && (m_ExecMode != ExecMode_Paused)) - return; - break; - - case ExecMode_Paused: - case ExecMode_Closed: - break; - } - - pxAssertDev((m_ExecMode == ExecMode_Closed) || (m_ExecMode == ExecMode_Paused), - "SysThreadBase is not in a closed/paused state? wtf!"); - - OnResumeReady(); - m_ExecMode = ExecMode_Opened; - m_sem_Resume.Post(); -} - - -// -------------------------------------------------------------------------------------- -// SysThreadBase *Worker* Implementations -// (Called from the context of this thread only) -// -------------------------------------------------------------------------------------- - -void SysThreadBase::OnStartInThread() -{ - m_RunningLock.Acquire(); - _parent::OnStartInThread(); - m_ExecMode = ExecMode_Closing; -} - -void SysThreadBase::OnCleanupInThread() -{ - m_ExecMode = ExecMode_NoThreadYet; - _parent::OnCleanupInThread(); - m_RunningLock.Release(); -} - -void SysThreadBase::OnSuspendInThread() {} -void SysThreadBase::OnResumeInThread(SystemsMask systemsToReinstate) {} - -// Tests for Pause and Suspend/Close requests. If the thread is trying to be paused or -// closed, it will enter a wait/holding pattern here in this method until the managing -// thread releases it. Use the return value to detect if changes to the thread's state -// may have been changed (based on the rule that other threads are not allowed to modify -// this thread's state without pausing or closing it first, to prevent race conditions). -// -// Return value: -// TRUE if the thread was paused or closed; FALSE if the thread -// continued execution unimpeded. -bool SysThreadBase::StateCheckInThread() -{ - SystemsMask systemsToTearDown {}; // Used for Pausing/Paused - - switch (m_ExecMode.load()) - { - -#ifdef PCSX2_DEVBUILD // optimize out handlers for these cases in release builds. - case ExecMode_NoThreadYet: - // threads should never have this state set while the thread is in any way - // active or alive. (for obvious reasons!!) - pxFailDev("Invalid execution state detected."); - return false; -#endif - - case ExecMode_Opened: - // Other cases don't need TestCancel() because its built into the various - // threading wait/signal actions. - TestCancel(); - return false; - - // ------------------------------------- - case ExecMode_Pausing: - { - systemsToTearDown = m_SystemsToTearDown.exchange({}, std::memory_order_relaxed); - - OnPauseInThread(systemsToTearDown); - m_ExecMode = ExecMode_Paused; - m_RunningLock.Release(); - } - [[fallthrough]]; - - case ExecMode_Paused: - while (m_ExecMode == ExecMode_Paused) - m_sem_Resume.WaitWithoutYield(); - - m_RunningLock.Acquire(); - if (m_ExecMode != ExecMode_Closing) - { - // AppCoreThread deals with Reseting CDVD - OnResumeInThread(g_CDVDReset ? static_cast(systemsToTearDown & ~(System_CDVD)) : systemsToTearDown); - g_CDVDReset = false; - break; - } - m_sem_ChangingExecMode.Post(); - - [[fallthrough]]; - - // fallthrough if we're switching to closing state... - // ------------------------------------- - case ExecMode_Closing: - { - OnSuspendInThread(); - m_ExecMode = ExecMode_Closed; - m_RunningLock.Release(); - } - [[fallthrough]]; - - case ExecMode_Closed: - while (m_ExecMode == ExecMode_Closed) - m_sem_Resume.WaitWithoutYield(); - - m_RunningLock.Acquire(); - OnResumeInThread(static_cast(-1)); // All systems - g_CDVDReset = false; - break; - - jNO_DEFAULT; - } - - return true; -} diff --git a/pcsx2/gui/SysThreads.h b/pcsx2/gui/SysThreads.h deleted file mode 100644 index 15922ca3a7..0000000000 --- a/pcsx2/gui/SysThreads.h +++ /dev/null @@ -1,290 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "System.h" - -#include "common/emitter/tools.h" -#include "PersistentThread.h" -#include "PINE.h" - - -using namespace Threading; - -typedef SafeArray VmStateBuffer; - -enum SystemsMask : uint8_t -{ - System_GS = 1 << 0, - System_SPU2 = 1 << 1, - System_PAD = 1 << 2, - System_FW = 1 << 3, - System_CDVD = 1 << 4, - System_USB = 1 << 5, - System_DEV9 = 1 << 6, - System_MCD = 1 << 7, -}; - -// -------------------------------------------------------------------------------------- -// SysThreadBase -// -------------------------------------------------------------------------------------- - -class SysThreadBase : public pxThread -{ - typedef pxThread _parent; - -public: - // Important: The order of these enumerations matters! Optimized tests are used for both - // Closed and Paused states. - enum ExecutionMode - { - // Thread has not been created yet. Typically this is the same as IsRunning() - // returning FALSE. - ExecMode_NoThreadYet, - - // Thread is safely paused, with subcomponents in a "closed" state, and waiting for a - // resume/open signal. - ExecMode_Closed, - - // Thread is safely paused, with subcomponents in an "open" state, and waiting for a - // resume/open signal. - ExecMode_Paused, - - // Thread is active and running, with pluigns in an "open" state. - ExecMode_Opened, - - // Close signal has been sent to the thread, but the thread's response is still - // pending (thread is busy/running). - ExecMode_Closing, - - // Pause signal has been sent to the thread, but the thread's response is still - // pending (thread is busy/running). - ExecMode_Pausing, - }; - -protected: - std::atomic m_ExecMode; - std::atomic m_SystemsToTearDown {}; - - // This lock is used to avoid simultaneous requests to Suspend/Resume/Pause from - // contending threads. - MutexRecursive m_ExecModeMutex; - - // Used to wake up the thread from sleeping when it's in a suspended state. - Semaphore m_sem_Resume; - - // Used to synchronize inline changes from paused to suspended status. - Semaphore m_sem_ChangingExecMode; - - // Locked whenever the thread is not in a suspended state (either closed or paused). - // Issue a Wait against this mutex for performing actions that require the thread - // to be suspended. - Mutex m_RunningLock; - -public: - explicit SysThreadBase(); - virtual ~SysThreadBase() = default; - - // Thread safety for IsOpen / IsClosed: The execution mode can change at any time on - // any thread, so the actual status may have already changed by the time this function - // returns its result. Typically this isn't of major concern. However if you need - // more assured execution mode status, issue a lock against the ExecutionModeMutex() - // first. - bool IsOpen() const - { - return IsRunning() && (m_ExecMode > ExecMode_Closed); - } - - bool IsClosed() const { return !IsOpen(); } - bool IsPaused() const { return !IsRunning() || (m_ExecMode <= ExecMode_Paused); } - - bool IsClosing() const - { - return !IsRunning() || (m_ExecMode <= ExecMode_Closed) || (m_ExecMode == ExecMode_Closing); - } - - bool HasPendingStateChangeRequest() const - { - return m_ExecMode >= ExecMode_Closing; - } - - ExecutionMode GetExecutionMode() const { return m_ExecMode.load(); } - Mutex& ExecutionModeMutex() { return m_ExecModeMutex; } - - virtual void Suspend(bool isBlocking = true); - virtual void Resume(); - virtual void Pause(SystemsMask systemsToTearDown, bool debug = false); - virtual void PauseSelf(); - virtual void PauseSelfDebug(); - -protected: - virtual void OnStart(); - - // This function is called by Resume immediately prior to releasing the suspension of - // the core emulation thread. You should overload this rather than Resume(), since - // Resume() has a lot of checks and balances to prevent re-entrance and race conditions. - virtual void OnResumeReady() {} - virtual void OnPause() {} - virtual void OnPauseDebug() {} - - virtual bool StateCheckInThread(); - virtual void OnCleanupInThread(); - virtual void OnStartInThread(); - - // Used internally from Resume(), so let's make it private here. - virtual void Start(); - - // Extending classes should implement this, but should not call it. The parent class - // handles invocation by the following guidelines: Called *in thread* from StateCheckInThread() - // prior to suspending the thread (ie, when Suspend() has been called on a separate - // thread, requesting this thread suspend itself temporarily). After this is called, - // the thread enters a waiting state on the m_sem_Resume semaphore. - virtual void OnSuspendInThread() = 0; - - // Extending classes should implement this, but should not call it. The parent class - // handles invocation by the following guidelines: Called *in thread* from StateCheckInThread() - // prior to pausing the thread (ie, when Pause() has been called on a separate thread, - // requesting this thread pause itself temporarily). After this is called, the thread - // enters a waiting state on the m_sem_Resume semaphore. - // Parameter: - // systemsToTearDown - a bitmask of systems to call Close functions on. - virtual void OnPauseInThread(SystemsMask systemsToTearDown) = 0; - - // Extending classes should implement this, but should not call it. The parent class - // handles invocation by the following guidelines: Called from StateCheckInThread() after the - // thread has been suspended and then subsequently resumed. - // Parameter: - // systemsToTearDown - a bitmask of systems to call Open functions on. - virtual void OnResumeInThread(SystemsMask systemsToReinstate) = 0; -}; - -// -------------------------------------------------------------------------------------- -// SysCoreThread class -// -------------------------------------------------------------------------------------- -class SysCoreThread : public SysThreadBase -{ - typedef SysThreadBase _parent; - -protected: - bool m_resetRecompilers; - bool m_resetProfilers; - bool m_resetVsyncTimers; - bool m_resetVirtualMachine; - - // Stores the state of the PINE thread. - std::unique_ptr m_pineServer; - - // Current state of the PINE thread - enum StatePINE - { - OFF, - ON - }; - StatePINE m_PineState = OFF; - - // Indicates if the system has an active virtual machine state. Pretty much always - // true anytime between subcomponents being initialized and being shutdown. Gets - // set false when they are shutdown, the corethread is canceled, or when an error - // occurs while trying to upload a new state into the VM. - std::atomic m_hasActiveMachine; - - wxString m_elf_override; - - SSE_MXCSR m_mxcsr_saved; - -public: - explicit SysCoreThread(); - virtual ~SysCoreThread(); - - bool HasPendingStateChangeRequest() const; - - virtual void OnResumeReady() override; - virtual void Reset(); - virtual void ResetQuick(); - virtual void Cancel(bool isBlocking = true) override; - virtual bool Cancel(const wxTimeSpan& timeout) override; - - virtual bool StateCheckInThread() override; - virtual void VsyncInThread(); - virtual void GameStartingInThread(); - - virtual void ApplySettings(const Pcsx2Config& src); - - virtual bool HasActiveMachine() const { return m_hasActiveMachine; } - - virtual const wxString& GetElfOverride() const { return m_elf_override; } - virtual void SetElfOverride(const wxString& elf); - -protected: - void _reset_stuff_as_needed(); - - virtual void Start() override; - virtual void OnStart() override; - virtual void OnSuspendInThread() override; - virtual void OnPauseInThread(SystemsMask systemsToTearDown) override { TearDownSystems(systemsToTearDown); } - virtual void OnResumeInThread(SystemsMask systemsToReinstate) override; - virtual void OnCleanupInThread() override; - virtual void ExecuteTaskInThread() override; - virtual void DoCpuReset(); - virtual void DoCpuExecute(); - - void _StateCheckThrows(); - -private: - void TearDownSystems(SystemsMask systemsToTearDown); -}; - - - -struct SysStateUnlockedParams -{ - SysStateUnlockedParams() {} -}; - -// -------------------------------------------------------------------------------------- -// IEventListener_SaveStateThread -// -------------------------------------------------------------------------------------- -class IEventListener_SysState : public IEventDispatcher -{ -public: - typedef SysStateUnlockedParams EvtParams; - -public: - IEventListener_SysState() {} - virtual ~IEventListener_SysState() = default; - - virtual void DispatchEvent(const SysStateUnlockedParams& status) - { - SysStateAction_OnUnlocked(); - } - -protected: - virtual void SysStateAction_OnUnlocked(); -}; - -// GetCoreThread() is a required external implementation. This function is *NOT* -// provided by the PCSX2 core library. It provides an interface for the linking User -// Interface apps or DLLs to reference their own instance of SysCoreThread (also allowing -// them to extend the class and override virtual methods). -// -extern SysCoreThread& GetCoreThread(); - -extern bool g_CDVDReset; - -namespace PINESettings -{ - extern unsigned int slot; -}; diff --git a/pcsx2/gui/ThreadingDialogs.cpp b/pcsx2/gui/ThreadingDialogs.cpp deleted file mode 100644 index 5138049870..0000000000 --- a/pcsx2/gui/ThreadingDialogs.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/ThreadingDialogs.h" -#include "gui/pxStaticText.h" - -using namespace pxSizerFlags; - -wxDEFINE_EVENT(pxEvt_ThreadedTaskComplete, wxCommandEvent); - -// -------------------------------------------------------------------------------------- -// WaitForTaskDialog Implementations -// -------------------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(WaitForTaskDialog, wxDialogWithHelpers); - -Threading::WaitForTaskDialog::WaitForTaskDialog(const wxString& title, const wxString& heading) - : wxDialogWithHelpers(NULL, _("Waiting for tasks...")) -//, m_Timer(this) -{ - SetMinWidth(300); - - //m_sem = sem; - //m_mutex = mutex; - - wxString m_title(title); - wxString m_heading(heading); - - if (m_title.IsEmpty()) - m_title = _("Waiting for task..."); - if (m_heading.IsEmpty()) - m_heading = m_title; - - Bind(pxEvt_ThreadedTaskComplete, &WaitForTaskDialog::OnTaskComplete, this); - - *this += 12; - *this += Heading(m_heading).Unwrapped() | StdExpand(); - *this += 12; - - // TODO : Implement a cancel button. Not quite sure the best way to do - // that, since it requires a thread or event handler context, or something. - - //applyDlg += new wxButton( &applyDlg, wxID_CANCEL ) | pxCenter; - //applyDlg += 6; - - //Bind(wxEVT_TIMER, &WaitForTaskDialog::OnTimer, this, m_Timer.GetId()); - //m_Timer.Start( 200 ); - //GetSysExecutorThread().PostEvent( new SysExecEvent_ApplyPlugins( this, m_sync ) ); -} - -void Threading::WaitForTaskDialog::OnTaskComplete(wxCommandEvent& evt) -{ - evt.Skip(); - - // Note: we don't throw exceptions from the pending task here. - // Instead we wait until we exit the modal loop below -- this gives - // the caller a chance to handle the exception themselves, and if - // not the exception will still fall back on the standard app-level - // exception handler. - - // (this also avoids any sticky business with the modal dialog not getting - // closed out right due to stack unwinding skipping dialog closure crap) - - m_sync.WaitForResult_NoExceptions(); - EndModal(wxID_OK); -} - -int Threading::WaitForTaskDialog::ShowModal() -{ - int result = _parent::ShowModal(); - m_sync.RethrowException(); - return result; -} diff --git a/pcsx2/gui/ThreadingDialogs.h b/pcsx2/gui/ThreadingDialogs.h deleted file mode 100644 index baba36a861..0000000000 --- a/pcsx2/gui/ThreadingDialogs.h +++ /dev/null @@ -1,52 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "common/Threading.h" -#include "pcsx2/gui/wxAppWithHelpers.h" - -wxDECLARE_EVENT(pxEvt_ThreadedTaskComplete, wxCommandEvent); - -namespace Threading -{ - // -------------------------------------------------------------------------------------- - // WaitForTaskDialog - // -------------------------------------------------------------------------------------- - // This dialog is displayed whenever the main thread is recursively waiting on multiple - // mutexes or semaphores. wxwidgets does not support recursive yielding to pending events - // but it *does* support opening a modal dialog, which disables the interface (preventing - // the user from starting additional actions), and processes messages (allowing the system - // to continue to manage threads and process logging). - // - class WaitForTaskDialog : public wxDialogWithHelpers - { - wxDECLARE_DYNAMIC_CLASS_NO_COPY(WaitForTaskDialog); - - typedef wxDialogWithHelpers _parent; - - protected: - SynchronousActionState m_sync; - - public: - WaitForTaskDialog(const wxString& title = wxEmptyString, const wxString& heading = wxEmptyString); - virtual ~WaitForTaskDialog() = default; - virtual int ShowModal(); - - protected: - void OnTaskComplete(wxCommandEvent& evt); - //void OnTimer( wxTimerEvent& evt ); - }; -} // namespace Threading diff --git a/pcsx2/gui/UpdateUI.cpp b/pcsx2/gui/UpdateUI.cpp deleted file mode 100644 index e922950db0..0000000000 --- a/pcsx2/gui/UpdateUI.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "MainFrame.h" -#include "GSFrame.h" -#include "Saveslots.h" - -// General Notes: -// * It's very important that we re-discover menu items by ID every time we change them, -// because the modern era of configurable GUIs means that we can't be assured the IDs -// exist anymore. - - -// This is necessary because this stupid wxWidgets thing has implicit debug errors -// in the FindItem call that asserts if the menu options are missing. This is bad -// mojo for configurable/dynamic menus. >_< -void MainEmuFrame::EnableMenuItem(int id, bool enable) -{ - if (wxMenuItem *item = m_menubar.FindItem(id)) - item->Enable(enable); -} - -void MainEmuFrame::SetMenuItemLabel(int id, wxString str) -{ - if (wxMenuItem *item = m_menubar.FindItem(id)) - item->SetItemLabel(str); -} - -void MainEmuFrame::CheckMenuItem(int id, bool checked) -{ - if (wxMenuItem *item = m_menubar.FindItem(id)) - item->Check(checked); -} - -static void _SaveLoadStuff(bool enabled) -{ - sMainFrame.EnableMenuItem(MenuId_Sys_LoadStates, enabled); - sMainFrame.EnableMenuItem(MenuId_Sys_SaveStates, enabled); - -#ifdef USE_NEW_SAVESLOTS_UI - const wxString wxDiscSerial(StringUtil::UTF8StringToWxString(DiscSerial)); - bool crcChanged = false; - // Run though all the slots. Update if they need updating or the crc changed. - for (Saveslot &slot : saveslot_cache) - { - if (!SysHasValidState()) - { - return; - } - - // We need to reload the file information if the crc or serial # changed. - // Invalidate slot cache when using full boot (g_GameLoading) otherwise it won't see the new folder path - if ((g_GameLoading || slot.crc != ElfCRC) || (slot.serialName != wxDiscSerial)) - { - slot.invalid_cache = true; - crcChanged = true; - } - - // Either the cache needs updating, or the menu items do, or both. - if (slot.menu_update || slot.invalid_cache) - { - #ifdef SAVESLOT_LOGS - Console.WriteLn("Updating slot %i.", slot.slot_num); - if (slot.menu_update) Console.WriteLn("Menu update needed."); - if (slot.invalid_cache) Console.WriteLn("Invalid cache. (CRC different or just initialized.)"); - #endif - - if (slot.invalid_cache) - { - // Pull everything from disk. - slot.UpdateCache(); - - #ifdef SAVESLOT_LOGS - slot.ConsoleDump(); - #endif - } - - // Update from the cached information. - slot.menu_update = false; - slot.crc = ElfCRC; - - sMainFrame.EnableMenuItem(slot.load_item_id, !slot.empty); - sMainFrame.CheckMenuItem(slot.load_item_id, slot.slot_num == States_GetCurrentSlot()); - sMainFrame.SetMenuItemLabel(slot.load_item_id, slot.SlotName()); - sMainFrame.SetMenuItemLabel(slot.save_item_id, slot.SlotName()); - } - } - if (crcChanged) - { - States_updateLoadBackupMenuItem(); - } -#endif -} - -// Updates the enable/disable status of all System related controls: menus, toolbars, -// etc. Typically called by SysEvtHandler whenever the message pump becomes idle. -void UI_UpdateSysControls() -{ - #ifdef SAVESLOT_LOGS - Console.WriteLn("In the routine for updating the UI."); - #endif - - if (wxGetApp().Rpc_TryInvokeAsync(&UI_UpdateSysControls)) - return; - - sApp.PostAction(CoreThreadStatusEvent(CoreThread_Indeterminate)); - - _SaveLoadStuff(SysHasValidState()); -} - -void UI_DisableSysShutdown() -{ - if (wxGetApp().Rpc_TryInvokeAsync(&UI_DisableSysShutdown)) - return; - - sMainFrame.EnableMenuItem(MenuId_Sys_Shutdown, false); - sMainFrame.EnableMenuItem(MenuId_IsoBrowse, !g_Conf->AskOnBoot); - wxGetApp().GetRecentIsoManager().EnableItems(!g_Conf->AskOnBoot); -} - -void UI_EnableSysShutdown() -{ - if (wxGetApp().Rpc_TryInvokeAsync(&UI_EnableSysShutdown)) - return; - - sMainFrame.EnableMenuItem(MenuId_Sys_Shutdown, true); -} - - -void UI_DisableSysActions() -{ - if (wxGetApp().Rpc_TryInvokeAsync(&UI_DisableSysActions)) - return; - - sMainFrame.EnableMenuItem(MenuId_Sys_Shutdown, false); - - _SaveLoadStuff(false); -} - -void UI_EnableSysActions() -{ - if (wxGetApp().Rpc_TryInvokeAsync(&UI_EnableSysActions)) - return; - - sMainFrame.EnableMenuItem(MenuId_Sys_Shutdown, true); - sMainFrame.EnableMenuItem(MenuId_IsoBrowse, true); - wxGetApp().GetRecentIsoManager().EnableItems(true); - - _SaveLoadStuff(true); -} - -void UI_DisableStateActions() -{ - if (wxGetApp().Rpc_TryInvokeAsync(&UI_DisableStateActions)) - return; - - _SaveLoadStuff(false); -} - -void UI_EnableStateActions() -{ - if (wxGetApp().Rpc_TryInvokeAsync(&UI_EnableStateActions)) - return; - - _SaveLoadStuff(true); -} diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp deleted file mode 100644 index 6c88c4f7a6..0000000000 --- a/pcsx2/gui/i18n.cpp +++ /dev/null @@ -1,364 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "i18n.h" -#include "AppConfig.h" -#include "StringHelpers.h" -#include "wxGuiTools.h" -#include "common/SafeArray.h" -#include - -// Some of the codes provided by wxWidgets are 'obsolete' -- effectively replaced by more specific -// region-qualified language codes. This function can be used to filter them out. -bool i18n_IsLegacyLanguageId( wxLanguage lang ) -{ - return - (lang == wxLANGUAGE_ENGLISH) || - (lang == wxLANGUAGE_CHINESE) || - (lang == wxLANGUAGE_CHINESE_TRADITIONAL) || - (lang == wxLANGUAGE_SERBIAN) || - (lang == wxLANGUAGE_SPANISH); -} - -static wxString i18n_GetBetterLanguageName( const wxLanguageInfo* info ) -{ - switch (info->Language) - { - case wxLANGUAGE_CHINESE: return L"Chinese (Traditional)"; -#if !wxCHECK_VERSION(3, 1, 6) - case wxLANGUAGE_CHINESE_TRADITIONAL: return L"Chinese (Traditional)"; -#endif - case wxLANGUAGE_CHINESE_TAIWAN: return L"Chinese (Traditional)"; - case wxLANGUAGE_CHINESE_HONGKONG: return L"Chinese (Traditional, Hong Kong)"; - case wxLANGUAGE_CHINESE_MACAU: return L"Chinese (Traditional, Macau)"; - } - - return info->Description; -} - -LangPackEnumeration::LangPackEnumeration( wxLanguage langId ) - : wxLangId(langId) -{ - if (const wxLanguageInfo* info = wxLocale::GetLanguageInfo( wxLangId )) - { - canonicalName = info->CanonicalName; - englishName = i18n_GetBetterLanguageName(info); - } -} - -LangPackEnumeration::LangPackEnumeration() - : wxLangId(wxLANGUAGE_DEFAULT) - , canonicalName(L"default") - , englishName(L"System Default" + _(" (default)")) -{ - int sysLang = wxLocale::GetSystemLanguage(); - - if (sysLang == wxLANGUAGE_UNKNOWN) - sysLang = wxLANGUAGE_ENGLISH_US; - - //if (const wxLanguageInfo* info = wxLocale::GetLanguageInfo( sysLang )) - // englishName += L" [" + i18n_GetBetterLanguageName(info) + L"]"; -} - -static void i18n_DoPackageCheck( wxLanguage wxLangId, LangPackList& langs, bool& valid_stat ) -{ - valid_stat = false; - if( i18n_IsLegacyLanguageId( wxLangId ) ) return; - - // note: wx preserves the current locale for us, so creating a new locale and deleting - // will not affect program status. - std::unique_ptr locale(new wxLocale(wxLangId, 0)); - - // Force the msgIdLanguage param to wxLANGUAGE_UNKNOWN to disable wx's automatic english - // matching logic, which will bypass the catalog loader for all english-based dialects, and - // (wrongly) enumerate a bunch of locales that don't actually exist. - - if ((locale->GetLanguage() == wxLANGUAGE_ENGLISH_US) || - (locale->IsOk() && locale->AddCatalog( L"pcsx2_Main", wxLANGUAGE_UNKNOWN, wxEmptyString )) ) - { - langs.push_back( LangPackEnumeration( wxLangId ) ); - valid_stat = true; - } -} - -// Finds all valid PCSX2 language packs, and enumerates them for configuration selection. -// Note: On linux there's no easy way to reliably enumerate language packs, since every distro -// could use its own location for installing pcsx2.mo files (wtcrap?). Furthermore wxWidgets -// doesn't give us a public API for checking what the language search paths are. So the only -// safe way to enumerate the languages is by forcibly loading every possible locale in the wx -// database. Anything which hasn't been installed will fail to load. -// -// Because loading and hashing the entire pcsx2 translation for every possible language would be -// asinine and slow, I've decided to use a file dedicated to being a translation detection anchor. -// This file is named pcsx2ident.mo, and contains only the name of the language in the language -// native form. Additional translation files are only loaded if the user picks the language (or -// if it's the default language of the user's OS installation). -// -void i18n_EnumeratePackages( LangPackList& langs ) -{ - wxDoNotLogInThisScope here; // wx generates verbose errors if languages don't exist, so disable them here. - langs.push_back( LangPackEnumeration() ); - bool valid_stat_dummy; - - for( int li=wxLANGUAGE_UNKNOWN+1; li_< - - //i18n_DoPackageCheck( wxLANGUAGE_VALENCIAN, englishNames, xlatedNames ); - //i18n_DoPackageCheck( wxLANGUAGE_SAMI, englishNames, xlatedNames ); -} - -#if 0 -// warning: wxWidgets uses duplicated canonical codes for many languages, and has some bizarre -// matching heuristics. Using this function doesn't really match the language and sublanguage -// (dialect) that the user selected. -bool i18n_SetLanguage( const wxString& langCode ) -{ - if (langCode.IsEmpty() || langCode.CmpNoCase(L"default")) - { - wxLanguage sysLang = (wxLanguage)wxLocale::GetSystemLanguage(); - - if (sysLang == wxLANGUAGE_UNKNOWN) - sysLang = wxLANGUAGE_ENGLISH; - } - - const wxLanguageInfo* woot = wxLocale::FindLanguageInfo( langCode ); - if (!woot) return false; - return i18n_SetLanguage( woot->Language ); -} -#endif - -// Multiple language ID are actually mostly identical languages. In case a translation is not -// yet provided for the dialect fallback to the main one. It would reduce the burden of the -// translators and reduce the language pack. -static wxLanguage i18n_FallbackToAnotherLang( wxLanguage wxLangId ) -{ - // if some translations are provided, do not change the language - LangPackList dummy_lang; - bool valid_stat = false; - i18n_DoPackageCheck(wxLangId, dummy_lang, valid_stat); - if (valid_stat) return wxLangId; - - switch(wxLangId) - { - case wxLANGUAGE_ARABIC_ALGERIA : - case wxLANGUAGE_ARABIC_BAHRAIN : - case wxLANGUAGE_ARABIC_EGYPT : - case wxLANGUAGE_ARABIC_IRAQ : - case wxLANGUAGE_ARABIC_JORDAN : - case wxLANGUAGE_ARABIC_KUWAIT : - case wxLANGUAGE_ARABIC_LEBANON : - case wxLANGUAGE_ARABIC_LIBYA : - case wxLANGUAGE_ARABIC_MOROCCO : - case wxLANGUAGE_ARABIC_OMAN : - case wxLANGUAGE_ARABIC_QATAR : - case wxLANGUAGE_ARABIC_SAUDI_ARABIA : - case wxLANGUAGE_ARABIC_SUDAN : - case wxLANGUAGE_ARABIC_SYRIA : - case wxLANGUAGE_ARABIC_TUNISIA : - case wxLANGUAGE_ARABIC_UAE : - case wxLANGUAGE_ARABIC_YEMEN : return wxLANGUAGE_ARABIC_SAUDI_ARABIA; - - case wxLANGUAGE_CHINESE_HONGKONG : - case wxLANGUAGE_CHINESE_MACAU : return wxLANGUAGE_CHINESE_TRADITIONAL; - case wxLANGUAGE_CHINESE_SINGAPORE : return wxLANGUAGE_CHINESE_SIMPLIFIED; - - // case wxLANGUAGE_SAMI : - // case wxLANGUAGE_DANISH : - case wxLANGUAGE_NORWEGIAN_NYNORSK : return wxLANGUAGE_NORWEGIAN_BOKMAL; - - case wxLANGUAGE_SWEDISH_FINLAND : return wxLANGUAGE_SWEDISH; - - case wxLANGUAGE_AFRIKAANS : - //case wxLANG_FRISIAN : - // case wxLANGUAGE_LUXEMBOURGISH : - // - not supported by wxWidgets (3.0.0). - case wxLANGUAGE_DUTCH_BELGIAN : return wxLANGUAGE_DUTCH; - - case wxLANGUAGE_GALICIAN : - case wxLANGUAGE_PORTUGUESE : return wxLANGUAGE_PORTUGUESE_BRAZILIAN; - - // Overkill 9000? - case wxLANGUAGE_GERMAN_AUSTRIAN : - case wxLANGUAGE_GERMAN_BELGIUM : - case wxLANGUAGE_GERMAN_LIECHTENSTEIN : - case wxLANGUAGE_GERMAN_LUXEMBOURG : - // case wxLANGUAGE_LOWER_SORBIAN : - // case wxLANGUAGE_UPPER_SORBIAN : - // - Sorbian is not supported by wxWidgets (3.0.0). - case wxLANGUAGE_GERMAN_SWISS : return wxLANGUAGE_GERMAN; - - case wxLANGUAGE_BASQUE: - case wxLANGUAGE_CATALAN: - case wxLANGUAGE_SPANISH_ARGENTINA: - case wxLANGUAGE_SPANISH_BOLIVIA: - case wxLANGUAGE_SPANISH_CHILE: - case wxLANGUAGE_SPANISH_COLOMBIA: - case wxLANGUAGE_SPANISH_COSTA_RICA: - case wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC: - case wxLANGUAGE_SPANISH_ECUADOR: - case wxLANGUAGE_SPANISH_EL_SALVADOR: - case wxLANGUAGE_SPANISH_GUATEMALA: - case wxLANGUAGE_SPANISH_HONDURAS: - case wxLANGUAGE_SPANISH_MEXICAN: - case wxLANGUAGE_SPANISH_NICARAGUA: - case wxLANGUAGE_SPANISH_PANAMA: - case wxLANGUAGE_SPANISH_PARAGUAY: - case wxLANGUAGE_SPANISH_PERU: - case wxLANGUAGE_SPANISH_PUERTO_RICO: - case wxLANGUAGE_SPANISH_URUGUAY: - case wxLANGUAGE_SPANISH_VENEZUELA: return wxLANGUAGE_SPANISH_MODERN; - - case wxLANGUAGE_ITALIAN_SWISS: return wxLANGUAGE_ITALIAN; - - case wxLANGUAGE_CORSICAN: - case wxLANGUAGE_FRENCH_BELGIAN: - case wxLANGUAGE_FRENCH_CANADIAN: - case wxLANGUAGE_FRENCH_LUXEMBOURG: - case wxLANGUAGE_FRENCH_MONACO: - case wxLANGUAGE_FRENCH_SWISS: return wxLANGUAGE_FRENCH; - - case wxLANGUAGE_RUSSIAN_UKRAINE: return wxLANGUAGE_RUSSIAN; - - case wxLANGUAGE_JAVANESE: return wxLANGUAGE_INDONESIAN; - - case wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM: return wxLANGUAGE_MALAY_MALAYSIA; - - default : break; - } - return wxLangId; -} - -// This method sets the requested language, based on wxLanguage id and an optional 'confirmation' -// canonical code. If the canonical code is provided, it is used to confirm that the ID matches -// the intended language/dialect. If the ID and canonical do not match, this method will use -// wx's FindLAnguageInfo to provide a "best guess" canonical match (usually relying on the user's -// operating system default). -// -// Rationale: wxWidgets language IDs are just simple enums, and not especially unique. Future -// versions of PCSX2 may have language ID changes if built against new/different versions of wx. -// To prevent PCSX2 from selecting a completely wrong language when upgraded, we double-check -// the wxLanguage code against the canonical name. We can't simply use canonical names either -// because those are not unique (dialects of chinese, for example), and wx returns the generic -// form over a specific dialect, when given a choice. Thus a two-tier check is required. -// -// wxLanguage for specific dialect, and canonical as a fallback/safeguard in case the wxLanguage -// id appears to be out of date. -// -// -bool i18n_SetLanguage( wxLanguage wxLangId, const wxString& langCode ) -{ - const wxLanguageInfo* info = wxLocale::GetLanguageInfo(wxLangId); - - // Check if you can load a similar language in case the current one is not yet provided - if (info) { - wxLanguage LangId_fallback = i18n_FallbackToAnotherLang((wxLanguage)info->Language); - if (LangId_fallback != (wxLanguage)info->Language) - info = wxLocale::GetLanguageInfo(LangId_fallback); - } - - // note: language canonical name mismatch probably means wxWidgets version changed since - // the user's ini file was provided. Missing/invalid ID probably means the same thing. - // If either is true, and the caller provided a canonical name, then let wx do a best - // match based on the canonical name. - - if (!info || (!langCode.IsEmpty() && (langCode.CmpNoCase(info->CanonicalName) != 0))) - { - if (!info) - Console.Warning( "Invalid language identifier (wxID=%d)", wxLangId ); - - if (!langCode.IsEmpty() && (langCode.CmpNoCase(L"default")!=0)) - { - info = wxLocale::FindLanguageInfo(langCode); - if (!info) - Console.Warning( "Unrecognized language canonical name '%ls'", WX_STR(langCode) ); - } - } - - if (!info) return false; - if (wxGetLocale() && (info->Language == wxGetLocale()->GetLanguage())) return true; - - std::unique_ptr locale(new wxLocale(info->Language)); - - if( !locale->IsOk() ) - { - Console.Warning( "SetLanguage: '%ls' [%ls] is not supported by the operating system", - WX_STR(i18n_GetBetterLanguageName(info)), WX_STR(locale->GetCanonicalName()) - ); - return false; - } - - wxLangId = (wxLanguage)locale->GetLanguage(); - - if (wxLangId == wxLANGUAGE_UNKNOWN) - { - Console.WriteLn("System-default language is unknown? Defaulting back to English/US."); - wxLangId = wxLANGUAGE_ENGLISH_US; - } - - // English/US is built in, so no need to load MO/PO files. - if( pxIsEnglish(wxLangId) ) - { - locale.release(); - return true; - } - - Console.WriteLn( "Loading language translation databases for '%ls' [%ls]", - WX_STR(i18n_GetBetterLanguageName(info)), WX_STR(locale->GetCanonicalName()) - ); - - static const wxChar* dictFiles[] = - { - L"pcsx2_Main", - L"pcsx2_Iconized" - }; - - bool foundone = false; - for (uint i=0; iAddCatalog(dictFiles[i])) - Console.Indent().WriteLn(Color_StrongYellow, "%ls not found -- translation dictionary may be incomplete.", dictFiles[i]); - else - foundone = true; - } - - if (!foundone) - { - Console.Warning("SetLanguage: Requested translation is not implemented yet."); - return false; - } - - locale.release(); - return true; -} - -// This method sets the lookup path to search l10n files -void i18n_SetLanguagePath() -{ - wxLocale::AddCatalogLookupPathPrefix(PathDefs::GetLangs().ToString()); -} diff --git a/pcsx2/gui/i18n.h b/pcsx2/gui/i18n.h deleted file mode 100644 index 10e513f323..0000000000 --- a/pcsx2/gui/i18n.h +++ /dev/null @@ -1,42 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2009 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - - -class LangPackEnumeration -{ -public: - wxLanguage wxLangId; - wxString canonicalName; - wxString englishName; - - // [TODO] : Might be nice, but have no idea how to implement it... - //wxString xlatedName; - -public: - LangPackEnumeration( wxLanguage langId ); - LangPackEnumeration(); -}; - -typedef std::vector LangPackList; - -extern bool i18n_SetLanguage( wxLanguage wxLangId, const wxString& langCode=wxEmptyString ); -extern void i18n_EnumeratePackages( LangPackList& langs ); -extern bool i18n_IsLegacyLanguageId( wxLanguage lang ); -extern void i18n_SetLanguagePath(); - diff --git a/pcsx2/gui/pxCheckBox.cpp b/pcsx2/gui/pxCheckBox.cpp deleted file mode 100644 index 0a57f5abee..0000000000 --- a/pcsx2/gui/pxCheckBox.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/pxCheckBox.h" -#include "gui/pxStaticText.h" - -using namespace pxSizerFlags; - -// -------------------------------------------------------------------------------------- -// pxCheckBox Implementations -// -------------------------------------------------------------------------------------- - -pxCheckBox::pxCheckBox(wxWindow* parent, const wxString& label, const wxString& subtext, int flags) - : wxPanelWithHelpers(parent, wxVERTICAL) -{ - Init(label, subtext, flags); -} - -pxCheckBox::pxCheckBox(wxWindow* parent, const wxString& label, int flags) - : wxPanelWithHelpers(parent, wxVERTICAL) -{ - Init(label, wxEmptyString, flags); -} - -void pxCheckBox::Init(const wxString& label, const wxString& subtext, int flags) -{ - m_subtext = NULL; - m_subPadding = StdPadding * 2; - m_checkbox = new wxCheckBox(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, flags); - - *this += m_checkbox | pxSizerFlags::StdExpand(); - - static const int Indentation = 23; - if (!subtext.IsEmpty()) - { - m_subtext = new pxStaticText(this, subtext, wxALIGN_LEFT); - - wxFlexGridSizer& spaced(*new wxFlexGridSizer(3)); - spaced.AddGrowableCol(1); - spaced += Indentation; - m_sizerItem_subtext = spaced.Add(m_subtext, pxBorder(wxBOTTOM, m_subPadding).Expand()); - //spaced += pxSizerFlags::StdPadding; - - *this += &spaced | pxExpand; - } - - Bind(wxEVT_CHECKBOX, &pxCheckBox::OnCheckpartCommand, this, m_checkbox->GetId()); -} - -pxCheckBox& pxCheckBox::SetSubPadding(int pad) -{ - m_subPadding = pad; - if (m_sizerItem_subtext) - { - m_sizerItem_subtext->SetBorder(m_subPadding); - Fit(); - } - return *this; -} - -// applies the tooltip to both both the checkbox and it's static subtext (if present), and -// performs word wrapping on platforms that need it (eg mswindows). -pxCheckBox& pxCheckBox::SetToolTip(const wxString& tip) -{ - pxSetToolTip(m_checkbox, tip); - pxSetToolTip(m_subtext, tip); - return *this; -} - -pxCheckBox& pxCheckBox::SetValue(bool val) -{ - pxAssert(m_checkbox); - m_checkbox->SetValue(val); - return *this; -} - -pxCheckBox& pxCheckBox::SetIndeterminate() -{ - pxAssert(m_checkbox); - m_checkbox->Set3StateValue(wxCHK_UNDETERMINED); - return *this; -} - - -pxCheckBox& pxCheckBox::SetState(wxCheckBoxState state) -{ - pxAssert(m_checkbox); - m_checkbox->Set3StateValue(state); - return *this; -} - -// Forwards checkbox actions on the internal checkbox (called 'checkpart') to listeners -// bound to the pxCheckBox "parent" panel. This helps the pxCheckBox behave more like a -// traditional checkbox. -void pxCheckBox::OnCheckpartCommand(wxCommandEvent& evt) -{ - evt.Skip(); - - wxCommandEvent newevt(evt); - newevt.SetEventObject(this); - newevt.SetId(GetId()); - GetEventHandler()->ProcessEvent(newevt); -} - -void operator+=(wxSizer& target, pxCheckBox* src) -{ - if (src) - target.Add(src, pxExpand); -} - -void operator+=(wxSizer& target, pxCheckBox& src) -{ - target.Add(&src, pxExpand); -} - -void operator+=(wxSizer* target, pxCheckBox& src) -{ - target->Add(&src, pxExpand); -} diff --git a/pcsx2/gui/pxCheckBox.h b/pcsx2/gui/pxCheckBox.h deleted file mode 100644 index 331d89c03e..0000000000 --- a/pcsx2/gui/pxCheckBox.h +++ /dev/null @@ -1,102 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include "common/Assertions.h" -#include "gui/wxGuiTools.h" - -// ------------------------------------------------------------------------------------- -// pxCheckBox -// -------------------------------------------------------------------------------------- -// The checkbox panel created uses the default spacer setting for adding checkboxes (see -// SizerFlags). The SetToolTip API provided by this function applies the tooltip to both -// both the checkbox and it's static subtext (if present), and performs word wrapping on -// platforms that need it (eg mswindows). -// -class pxCheckBox : public wxPanelWithHelpers -{ -protected: - wxCheckBox* m_checkbox; - pxStaticText* m_subtext; - - // padding below the subtext (if there's subtext). If there's no subtext, this value is unused. - int m_subPadding; - - wxSizerItem* m_sizerItem_subtext; - -public: - pxCheckBox(wxWindow* parent, const wxString& label, const wxString& subtext = wxEmptyString, int flags = wxCHK_2STATE); - pxCheckBox(wxWindow* parent, const wxString& label, int flags); - virtual ~pxCheckBox() = default; - - bool HasSubText() const { return m_subtext != NULL; } - const pxStaticText* GetSubText() const { return m_subtext; } - - pxCheckBox& SetSubPadding(int pad); - pxCheckBox& SetToolTip(const wxString& tip); - pxCheckBox& SetValue(bool val); - pxCheckBox& SetIndeterminate(); - pxCheckBox& SetState(wxCheckBoxState state); - - wxCheckBoxState GetState() const - { - pxAssert(m_checkbox != NULL); - return m_checkbox->Get3StateValue(); - } - bool GetValue() const - { - pxAssert(m_checkbox != NULL); - return m_checkbox->GetValue(); - } - bool IsChecked() const - { - pxAssert(m_checkbox != NULL); - return m_checkbox->IsChecked(); - } - bool IsIndeterminate() const - { - pxAssert(m_checkbox != NULL); - return m_checkbox->Get3StateValue() == wxCHK_UNDETERMINED; - } - operator wxCheckBox&() - { - pxAssert(m_checkbox != NULL); - return *m_checkbox; - } - operator const wxCheckBox&() const - { - pxAssert(m_checkbox != NULL); - return *m_checkbox; - } - - wxCheckBox* GetWxPtr() { return m_checkbox; } - const wxCheckBox* GetWxPtr() const { return m_checkbox; } - - //wxWindowID GetId() const { pxAssert( m_checkbox != NULL ); return m_checkbox->GetId(); } - -protected: - void Init(const wxString& label, const wxString& subtext, int flags); - void OnCheckpartCommand(wxCommandEvent& evt); -}; - -extern void operator+=(wxSizer& target, pxCheckBox& src); - -template <> -inline void operator+=(wxSizer& target, const pxWindowAndFlags& src) -{ - target.Add(src.window, src.flags); -} diff --git a/pcsx2/gui/pxEventThread.h b/pcsx2/gui/pxEventThread.h deleted file mode 100644 index 02ef673c2f..0000000000 --- a/pcsx2/gui/pxEventThread.h +++ /dev/null @@ -1,307 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "gui/PersistentThread.h" -#include "gui/pxEvents.h" - -#include -#include - -// TODO!! Make the system defined in this header system a bit more generic, and then move -// it to the Utilities library. - -class pxEvtQueue; -class SysExecEvent; - -// -------------------------------------------------------------------------------------- -// pxEvtLog / ConsoleLogSource_Event -// -------------------------------------------------------------------------------------- - -class ConsoleLogSource_Event : ConsoleLogSource -{ - typedef ConsoleLogSource _parent; - -public: - using _parent::IsActive; - - ConsoleLogSource_Event(); - - bool Write( const pxEvtQueue* evtHandler, const SysExecEvent* evt, const wxChar* msg ); - bool Warn( const pxEvtQueue* evtHandler, const SysExecEvent* evt, const wxChar* msg ); - bool Error( const pxEvtQueue* evtHandler, const SysExecEvent* evt, const wxChar* msg ); -}; - -extern ConsoleLogSource_Event pxConLog_Event; - -#define pxEvtLog pxConLog_Event.IsActive() && pxConLog_Event - - -// -------------------------------------------------------------------------------------- -// SysExecEvent -// -------------------------------------------------------------------------------------- -// Base class for all pxEvtQueue processable events. -// -// Rules for deriving: -// * Override InvokeEvent(), *NOT* _DoInvokeEvent(). _DoInvokeEvent() performs setup and -// wraps exceptions for transport to the invoking context/thread, and then itself calls -// InvokeEvent() to perform the derived class implementation. -// -// * Derived classes must implement their own versions of an empty constructor and -// Clone(), or else the class will fail to be copied to the event handler's thread -// context correctly. -// -// * This class is not abstract, and gives no error if the invocation method is not -// overridden: It can be used as a simple ping device against the event queue, Re- -// awaking the invoking thread as soon as the queue has caught up to and processed -// the event. -// -// * Avoid using virtual class inheritence to 'cleverly' bind a SysExecEvent to another -// existing class. Multiple inheritence is unreliable at best, and virtual inheritence -// is even worse. Create a SysExecEvent wrapper class instead, and embed an instance of -// the other class you want to turn into an event within it. It might feel like more work -// but it *will* be less work in the long run. -// -class SysExecEvent -{ -protected: - SynchronousActionState* m_sync; - -public: - virtual ~SysExecEvent() = default; - virtual SysExecEvent* Clone() const { return new SysExecEvent( *this ); } - - SysExecEvent( SynchronousActionState* sync=NULL ) - { - m_sync = sync; - } - - SysExecEvent( SynchronousActionState& sync ) - { - m_sync = &sync; - } - - const SynchronousActionState* GetSyncState() const { return m_sync; } - SynchronousActionState* GetSyncState() { return m_sync; } - - SysExecEvent& SetSyncState( SynchronousActionState* obj ) { m_sync = obj; return *this; } - SysExecEvent& SetSyncState( SynchronousActionState& obj ) { m_sync = &obj; return *this; } - - // Tells the Event Handler whether or not this event can be skipped when the system - // is being quit or reset. Typically set this to true for events which shut down the - // system, since program crashes can occur if the program tries to exit while threads - // are running. - virtual bool IsCriticalEvent() const { return false; } - - // Tells the Event Handler whether or not this event can be canceled. Typically events - // should not prohibit cancellation, since it expedites program termination and helps - // avoid permanent deadlock. Some actions like saving states and shutdown procedures - // should not allow cancellation since they could result in program crashes or corrupted - // data. - virtual bool AllowCancelOnExit() const { return true; } - - virtual void _DoInvokeEvent(); - virtual void PostResult() const; - - virtual wxString GetEventName() const; - virtual wxString GetEventMessage() const; - - virtual int GetResult() - { - if( !pxAssertDev( m_sync != NULL, "SysEvent: Expecting return value, but no sync object provided." ) ) return 0; - return m_sync->return_value; - } - - virtual void SetException( BaseException* ex ); - - void SetException( const BaseException& ex ); - -protected: - virtual void InvokeEvent(); - virtual void CleanupEvent(); -}; - -// -------------------------------------------------------------------------------------- -// SysExecEvent_MethodVoid -// -------------------------------------------------------------------------------------- -class SysExecEvent_MethodVoid : public SysExecEvent -{ -protected: - FnType_Void* m_method; - bool m_IsCritical; - wxString m_TraceName; - -public: - wxString GetEventName() const { return m_TraceName; } - - virtual ~SysExecEvent_MethodVoid() = default; - SysExecEvent_MethodVoid* Clone() const { return new SysExecEvent_MethodVoid( *this ); } - - bool AllowCancelOnExit() const { return !m_IsCritical; } - bool IsCriticalEvent() const { return m_IsCritical; } - - explicit SysExecEvent_MethodVoid( FnType_Void* method = NULL, const wxChar* traceName=NULL ) - : m_TraceName( traceName ? traceName : L"VoidMethod" ) - { - m_method = method; - m_IsCritical = false; - } - - SysExecEvent_MethodVoid& Critical() - { - m_IsCritical = true; - return *this; - } - -protected: - void InvokeEvent() - { - if( m_method ) m_method(); - } -}; - -typedef std::list pxEvtList; - -// -------------------------------------------------------------------------------------- -// pxEvtQueue -// -------------------------------------------------------------------------------------- -// Thread-safe platform-independent message queue, intended to act as a proxy between -// control threads (such as the Main/UI thread) and worker threads. -// -// Proxy message queues provide a safe environment for queuing tasks that must be executed -// in sequential order (in blocking fashion) on one or more worker threads. The queue is -// deadlock-free, which means the Main/UI thread can queue events into this EventQueue without -// fear of causing unresponsiveness within the user interface. -// -// Rationales: -// * Using the main event handler of wxWidgets is dangerous because it must call itself -// recursively when waiting on threaded events such as semaphore and mutexes. Thus, -// tasks such as suspending the VM would invoke the event queue while waiting, -// running events that expect the suspend to be complete while the suspend was still -// pending. -// -// * wxWidgets Event Queue (wxEvtHandler) isn't thread-safe and isn't even intended for -// use for anything other than wxWindow events (it uses static vars and checks/modifies -// wxApp globals while processing), so it's useless to us. Have to roll our own. -_- -// -class pxEvtQueue -{ -protected: - pxEvtList m_pendingEvents; - pxEvtList m_idleEvents; - - Threading::MutexRecursive m_mtx_pending; - Threading::Semaphore m_wakeup; - wxThreadIdType m_OwnerThreadId; - std::atomic m_Quitting; - - // Used for performance measuring the execution of individual events, - // and also for detecting deadlocks during message processing. - // Clang-3.7 failed to link (maybe 64 bits atomic isn't supported on 32 bits) - // std::atomic m_qpc_Start; - u64 m_qpc_Start; - -public: - pxEvtQueue(); - virtual ~pxEvtQueue() = default; - - virtual wxString GetEventHandlerName() const { return L"pxEvtQueue"; } - - virtual void ShutdownQueue(); - bool IsShuttingDown() const { return !!m_Quitting; } - - void ProcessEvents( pxEvtList& list, bool isIdle=false ); - void ProcessPendingEvents(); - void ProcessIdleEvents(); - void Idle(); - - void AddPendingEvent( SysExecEvent& evt ); - void PostEvent( SysExecEvent* evt ); - void PostEvent( const SysExecEvent& evt ); - void PostIdleEvent( SysExecEvent* evt ); - void PostIdleEvent( const SysExecEvent& evt ); - - void ProcessEvent( SysExecEvent* evt ); - void ProcessEvent( SysExecEvent& evt ); - - bool Rpc_TryInvokeAsync( FnType_Void* method, const wxChar* traceName=NULL ); - bool Rpc_TryInvoke( FnType_Void* method, const wxChar* traceName=NULL ); - void SetActiveThread(); - -protected: - virtual void _DoIdle() {} -}; - -// -------------------------------------------------------------------------------------- -// ExecutorThread -// -------------------------------------------------------------------------------------- -// Threaded wrapper class for implementing a pxEvtQueue on its own thread, to serve as a -// proxy between worker threads and response threads (which cannot be allowed to stall or -// deadlock). Simply create the desired EvtHandler, start the thread, and enjoy queued -// event execution in fully blocking fashion. -// -// Deadlock Protection Notes: -// The ExecutorThread utilizes an underlying pxEventQueue, which only locks the queue for -// adding and removing items only. Events are processed during an unlocked queue state, -// which allows other threads to add events with a guarantee that the add operation will -// take very little time. -// -// Implementation Notes: -// We use object encapsulation instead of multiple inheritance in order to avoid the many -// unavoidable catastrophes and pitfalls involved in multi-inheritance that would ruin our -// will to live. The alternative requires manually exposing the interface of the underlying -// instance of pxEventQueue; and that's ok really when you consider the alternative. --air -// -class ExecutorThread : public Threading::pxThread -{ - typedef Threading::pxThread _parent; - -protected: - std::unique_ptr m_ExecutorTimer; - std::unique_ptr m_EvtHandler; - -public: - ExecutorThread( pxEvtQueue* evtandler = NULL ); - virtual ~ExecutorThread() = default; - - virtual void ShutdownQueue(); - bool IsRunning() const; - - void PostEvent( SysExecEvent* evt ); - void PostEvent( const SysExecEvent& evt ); - - void PostIdleEvent( SysExecEvent* evt ); - void PostIdleEvent( const SysExecEvent& evt ); - - void ProcessEvent( SysExecEvent* evt ); - void ProcessEvent( SysExecEvent& evt ); - - bool Rpc_TryInvokeAsync( void (*evt)(), const wxChar* traceName=NULL ) - { - return m_EvtHandler ? m_EvtHandler->Rpc_TryInvokeAsync( evt, traceName ) : false; - } - - bool Rpc_TryInvoke( void (*evt)(), const wxChar* traceName=NULL ) - { - return m_EvtHandler ? m_EvtHandler->Rpc_TryInvoke( evt, traceName ) : false; - } - -protected: - void OnStart(); - void ExecuteTaskInThread(); - void OnCleanupInThread(); -}; - diff --git a/pcsx2/gui/pxEvents.h b/pcsx2/gui/pxEvents.h deleted file mode 100644 index 527df4e0d0..0000000000 --- a/pcsx2/gui/pxEvents.h +++ /dev/null @@ -1,425 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include "common/General.h" -#include "common/Pcsx2Defs.h" -#include "common/Threading.h" -#include "gui/PersistentThread.h" - -wxDECLARE_EVENT(pxEvt_StartIdleEventTimer, wxCommandEvent); -wxDECLARE_EVENT(pxEvt_DeleteObject, wxCommandEvent); -wxDECLARE_EVENT(pxEvt_DeleteThread, wxCommandEvent); - -typedef void FnType_Void(); - -// -------------------------------------------------------------------------------------- -// SynchronousActionState -// -------------------------------------------------------------------------------------- -class SynchronousActionState -{ - DeclareNoncopyableObject(SynchronousActionState); - -protected: - bool m_posted; - Threading::Semaphore m_sema; - ScopedExcept m_exception; - -public: - sptr return_value; - - SynchronousActionState() - { - m_posted = false; - return_value = 0; - } - - virtual ~SynchronousActionState() = default; - - void SetException(const BaseException& ex); - void SetException(BaseException* ex); - - Threading::Semaphore& GetSemaphore() { return m_sema; } - const Threading::Semaphore& GetSemaphore() const { return m_sema; } - - void RethrowException() const; - int WaitForResult(); - int WaitForResult_NoExceptions(); - void PostResult(int res); - void ClearResult(); - void PostResult(); -}; - - -// -------------------------------------------------------------------------------------- -// pxSimpleEvent - non-abstract implementation of wxEvent -// -------------------------------------------------------------------------------------- -// Why? I mean, why is wxEvent abstract? Over-designed OO is such a bad habit. And while -// I'm on my high horse (and it's so very high!), why use 'private'? Ever? Seriously, it -// sucks. Stop using it, people. -// -class pxSimpleEvent : public wxEvent -{ - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxSimpleEvent); - -public: - explicit pxSimpleEvent(int evtid = 0) - : wxEvent(0, evtid) - { - } - - pxSimpleEvent(wxWindowID winId, int evtid) - : wxEvent(winId, evtid) - { - } - - pxSimpleEvent(const pxSimpleEvent&) = default; - virtual wxEvent* Clone() const { return new pxSimpleEvent(*this); } -}; - -// -------------------------------------------------------------------------------------- -// pxActionEvent -// -------------------------------------------------------------------------------------- -class pxActionEvent; - -wxDECLARE_EVENT(pxEvt_InvokeAction, pxActionEvent); - -class pxActionEvent : public wxEvent -{ - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxActionEvent); - -protected: - SynchronousActionState* m_state; - -public: - virtual ~pxActionEvent() = default; - virtual pxActionEvent* Clone() const { return new pxActionEvent(*this); } - - explicit pxActionEvent(SynchronousActionState* sema = NULL, int msgtype = pxEvt_InvokeAction); - explicit pxActionEvent(SynchronousActionState& sema, int msgtype = pxEvt_InvokeAction); - pxActionEvent(const pxActionEvent& src); - - Threading::Semaphore* GetSemaphore() const { return m_state ? &m_state->GetSemaphore() : NULL; } - - const SynchronousActionState* GetSyncState() const { return m_state; } - SynchronousActionState* GetSyncState() { return m_state; } - - void SetSyncState(SynchronousActionState* obj) { m_state = obj; } - void SetSyncState(SynchronousActionState& obj) { m_state = &obj; } - - virtual void SetException(BaseException* ex); - void SetException(const BaseException& ex); - - virtual void _DoInvokeEvent(); - -protected: - // Extending classes should implement this method to perform whatever action it is - // the event is supposed to do. :) Thread affinity is guaranteed to be the Main/UI - // thread, and exceptions will be handled automatically. - // - // Exception note: exceptions are passed back to the thread that posted the event - // to the queue, when possible. If the calling thread is not blocking for a result - // from this event, then the exception will be posted to the Main/UI thread instead. - virtual void InvokeEvent() {} -}; - - -// -------------------------------------------------------------------------------------- -// pxExceptionEvent -// -------------------------------------------------------------------------------------- -class pxExceptionEvent : public pxActionEvent -{ - typedef pxActionEvent _parent; - -protected: - BaseException* m_except; - -public: - pxExceptionEvent(BaseException* ex = NULL) - { - m_except = ex; - } - - pxExceptionEvent(const BaseException& ex); - - virtual ~pxExceptionEvent() - { - } - - virtual pxExceptionEvent* Clone() const { return new pxExceptionEvent(*this); } - -protected: - void InvokeEvent(); -}; - -// -------------------------------------------------------------------------------------- -// pxSynchronousCommandEvent -// -------------------------------------------------------------------------------------- - -class pxSynchronousCommandEvent : public wxCommandEvent -{ - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxSynchronousCommandEvent); - -protected: - SynchronousActionState* m_sync; - wxEventType m_realEvent; - -public: - virtual ~pxSynchronousCommandEvent() = default; - virtual pxSynchronousCommandEvent* Clone() const { return new pxSynchronousCommandEvent(*this); } - - pxSynchronousCommandEvent(SynchronousActionState* sema = NULL, wxEventType commandType = wxEVT_NULL, int winid = 0); - pxSynchronousCommandEvent(SynchronousActionState& sema, wxEventType commandType = wxEVT_NULL, int winid = 0); - - pxSynchronousCommandEvent(SynchronousActionState* sema, const wxCommandEvent& evt); - pxSynchronousCommandEvent(SynchronousActionState& sema, const wxCommandEvent& evt); - - pxSynchronousCommandEvent(const pxSynchronousCommandEvent& src); - - Threading::Semaphore* GetSemaphore() { return m_sync ? &m_sync->GetSemaphore() : NULL; } - wxEventType GetRealEventType() const { return m_realEvent; } - - void SetException(BaseException* ex); - void SetException(const BaseException& ex); -}; - -wxDECLARE_EVENT(pxEvt_SynchronousCommand, pxSynchronousCommandEvent); - -// -------------------------------------------------------------------------------------- -// BaseMessageBoxEvent -// -------------------------------------------------------------------------------------- -class BaseMessageBoxEvent : public pxActionEvent -{ - typedef pxActionEvent _parent; - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(BaseMessageBoxEvent); - -protected: - wxString m_Content; - -public: - virtual ~BaseMessageBoxEvent() = default; - virtual BaseMessageBoxEvent* Clone() const { return new BaseMessageBoxEvent(*this); } - - explicit BaseMessageBoxEvent(const wxString& content = wxEmptyString, SynchronousActionState* instdata = NULL); - BaseMessageBoxEvent(const wxString& content, SynchronousActionState& instdata); - BaseMessageBoxEvent(const BaseMessageBoxEvent& event); - -protected: - virtual void InvokeEvent(); - virtual int _DoDialog() const; -}; - -// -------------------------------------------------------------------------------------- -// MsgButtons -// -------------------------------------------------------------------------------------- -class MsgButtons -{ -protected: - BITFIELD32() - bool - m_OK : 1, - m_Cancel : 1, - m_Yes : 1, - m_No : 1, - m_AllowToAll : 1, - m_Apply : 1, - m_Abort : 1, - m_Retry : 1, - m_Ignore : 1, - m_Reset : 1, - m_Close : 1; - BITFIELD_END - - wxString m_CustomLabel; - wxString m_CustomLabelId; - -public: - MsgButtons() { bitset = 0; } - - MsgButtons& OK() - { - m_OK = true; - return *this; - } - MsgButtons& Cancel() - { - m_Cancel = true; - return *this; - } - MsgButtons& Apply() - { - m_Apply = true; - return *this; - } - MsgButtons& Yes() - { - m_Yes = true; - return *this; - } - MsgButtons& No() - { - m_No = true; - return *this; - } - MsgButtons& ToAll() - { - m_AllowToAll = true; - return *this; - } - - MsgButtons& Abort() - { - m_Abort = true; - return *this; - } - MsgButtons& Retry() - { - m_Retry = true; - return *this; - } - MsgButtons& Ignore() - { - m_Ignore = true; - return *this; - } - MsgButtons& Reset() - { - m_Reset = true; - return *this; - } - MsgButtons& Close() - { - m_Close = true; - return *this; - } - - // label - native language label displayed to user - // id - raw ASCII identifier used in the config file (do not translate, hence char*) - MsgButtons& Custom(const wxString& label, const char* id) - { - m_CustomLabel = label; - m_CustomLabelId = fromUTF8(id); - return *this; - } - - MsgButtons& OKCancel() - { - m_OK = m_Cancel = true; - return *this; - } - MsgButtons& YesNo() - { - m_Yes = m_No = true; - return *this; - } - - bool HasOK() const { return m_OK; } - bool HasCancel() const { return m_Cancel; } - bool HasApply() const { return m_Apply; } - bool HasYes() const { return m_Yes; } - bool HasNo() const { return m_No; } - bool AllowsToAll() const { return m_AllowToAll; } - - bool HasAbort() const { return m_Abort; } - bool HasRetry() const { return m_Retry; } - bool HasIgnore() const { return m_Ignore; } - bool HasReset() const { return m_Reset; } - bool HasClose() const { return m_Close; } - - bool HasCustom() const { return !m_CustomLabel.IsEmpty(); } - const wxString& GetCustomLabel() const { return m_CustomLabel; } - const wxString& GetCustomLabelId() const { return m_CustomLabelId; } - - bool Allows(wxWindowID id) const; - void SetBestFocus(wxWindow* dialog) const; - void SetBestFocus(wxWindow& dialog) const; - - bool operator==(const MsgButtons& right) const - { - return OpEqu(bitset); - } - - bool operator!=(const MsgButtons& right) const - { - return !OpEqu(bitset); - } -}; - -// -------------------------------------------------------------------------------------- -// pxMessageBoxEvent -// -------------------------------------------------------------------------------------- -// This event type is used to transfer message boxes to the main UI thread, and return the -// result of the box. It's the only way a message box can be issued from non-main threads -// with complete safety in wx2.8. -// -// For simplicity sake this message box only supports two basic designs. The main design -// is a generic message box with confirmation buttons of your choosing. Additionally you -// can specify a "scrollableContent" text string, which is added into a read-only richtext -// control similar to the console logs and such. -// -// Future consideration: If wxWidgets 3.0 has improved thread safety, then it should probably -// be reasonable for it to work with a more flexable model where the dialog can be created -// on a child thread, passed to the main thread, where ShowModal() is run (keeping the nested -// message pumps on the main thread where they belong). But so far this is not possible, -// because of various subtle issues in wx2.8 design. -// -class pxMessageBoxEvent : public BaseMessageBoxEvent -{ - typedef BaseMessageBoxEvent _parent; - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxMessageBoxEvent); - -protected: - wxString m_Title; - MsgButtons m_Buttons; - -public: - virtual ~pxMessageBoxEvent() = default; - virtual pxMessageBoxEvent* Clone() const { return new pxMessageBoxEvent(*this); } - - pxMessageBoxEvent() {} - pxMessageBoxEvent(const wxString& title, const wxString& content, const MsgButtons& buttons, SynchronousActionState& instdata); - pxMessageBoxEvent(const wxString& title, const wxString& content, const MsgButtons& buttons, SynchronousActionState* instdata = NULL); - pxMessageBoxEvent(const pxMessageBoxEvent& event) = default; - -protected: - int _DoDialog() const; -}; - -// -------------------------------------------------------------------------------------- -// pxAssertionEvent -// -------------------------------------------------------------------------------------- -class pxAssertionEvent : public BaseMessageBoxEvent -{ - typedef BaseMessageBoxEvent _parent; - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxAssertionEvent); - -protected: - wxString m_Stacktrace; - -public: - virtual ~pxAssertionEvent() = default; - virtual pxAssertionEvent* Clone() const { return new pxAssertionEvent(*this); } - - pxAssertionEvent(const wxString& content = wxEmptyString, const wxString& trace = wxEmptyString, SynchronousActionState* instdata = NULL); - pxAssertionEvent(const wxString& content, const wxString& trace, SynchronousActionState& instdata); - pxAssertionEvent(const pxAssertionEvent& event) = default; - - pxAssertionEvent& SetStacktrace(const wxString& trace); - -protected: - int _DoDialog() const; -}; diff --git a/pcsx2/gui/pxRadioPanel.cpp b/pcsx2/gui/pxRadioPanel.cpp deleted file mode 100644 index 2035d4caf6..0000000000 --- a/pcsx2/gui/pxRadioPanel.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/pxRadioPanel.h" -#include "gui/pxStaticText.h" -#include "common/SafeArray.inl" - -template class SafeArray; - -// =========================================================================================== -// pxRadioPanel Implementations -// =========================================================================================== - -#define VerifyRealizedState() \ - pxAssertDev(m_IsRealized, "Invalid object state: RadioButtonGroup as not been realized.") - -void pxRadioPanel::Init(const RadioPanelItem* srcArray, int arrsize) -{ - m_DefaultIdx = -1; - m_IsRealized = false; - - // FIXME: This probably needs to be platform-dependent, and/or based on font size. - m_Indentation = 23; - - for (int i = 0; i < arrsize; ++i) - Append(srcArray[i]); -} - -pxRadioPanel& pxRadioPanel::Append(const RadioPanelItem& entry) -{ - m_buttonStrings.push_back(entry); - return *this; -} - -void pxRadioPanel::Reset() -{ - m_IsRealized = false; - const int numbuttons = m_buttonStrings.size(); - if (numbuttons == 0) - return; - - for (int i = 0; i < numbuttons; ++i) - { - safe_delete(m_objects[i].LabelObj); - safe_delete(m_objects[i].SubTextObj); - } - m_buttonStrings.clear(); -} - -void pxRadioPanel::Realize() -{ - const int numbuttons = m_buttonStrings.size(); - if (numbuttons == 0) - return; - if (m_IsRealized) - return; - m_IsRealized = true; - - m_objects.MakeRoomFor(numbuttons); - - // Add all RadioButtons in one pass, and then go back and create all the subtext - // objects. This ensures the radio buttons have consecutive tab order IDs, which - // is the "preferred" method when using grouping features of the native window - // managers (GTK tends to not care either way, but Win32 definitely prefers a - // linear tab order). - - // first object has the group flag set to ensure it's the start of a radio group. - m_objects[0].LabelObj = new wxRadioButton(this, wxID_ANY, m_buttonStrings[0].Label, wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - for (int i = 1; i < numbuttons; ++i) - m_objects[i].LabelObj = new wxRadioButton(this, wxID_ANY, m_buttonStrings[i].Label); - - for (int i = 0; i < numbuttons; ++i) - { - m_objects[i].SubTextObj = NULL; - if (m_buttonStrings[i].SubText.IsEmpty()) - continue; - m_objects[i].SubTextObj = new pxStaticText(this, m_buttonStrings[i].SubText, wxALIGN_LEFT); - } - - pxAssert(GetSizer() != NULL); - - for (int i = 0; i < numbuttons; ++i) - { - *this += m_objects[i].LabelObj | pxSizerFlags::StdExpand(); - - if (pxStaticText* subobj = m_objects[i].SubTextObj) - { - *this += subobj | pxBorder(wxLEFT, m_Indentation).Expand(); - *this += 9 + m_padding.GetHeight(); - } - if (!m_buttonStrings[i].ToolTip.IsEmpty()) - _setToolTipImmediate(i, m_buttonStrings[i].ToolTip); - } - - _RealizeDefaultOption(); -} - -void pxRadioPanel::_setToolTipImmediate(int idx, const wxString& tip) -{ - if (wxRadioButton* woot = m_objects[idx].LabelObj) - woot->SetToolTip(tip); - - if (pxStaticText* woot = m_objects[idx].SubTextObj) - woot->SetToolTip(tip); -} - -// The SetToolTip API provided by this function applies the tooltip to both the radio -// button and it's static subtext (if present), and performs word wrapping on platforms -// that need it (eg mswindows). -pxRadioPanel& pxRadioPanel::SetToolTip(int idx, const wxString& tip) -{ - m_buttonStrings[idx].SetToolTip(tip); - - if (m_IsRealized) - _setToolTipImmediate(idx, tip); - - return *this; -} - -pxRadioPanel& pxRadioPanel::SetSelection(int idx) -{ - if (!VerifyRealizedState()) - return *this; - - pxAssert(m_objects[idx].LabelObj != NULL); - m_objects[idx].LabelObj->SetValue(true); - return *this; -} - -void pxRadioPanel::_RealizeDefaultOption() -{ - if (m_IsRealized && m_DefaultIdx != -1) - { - wxFont def(GetFont()); - def.SetWeight(wxFONTWEIGHT_BOLD); - //def.SetStyle( wxFONTSTYLE_ITALIC ); - m_objects[m_DefaultIdx].LabelObj->SetFont(def); - m_objects[m_DefaultIdx].LabelObj->SetForegroundColour(wxColour(20, 128, 40)); - } -} - -// Highlights (bold) the text of the default radio. -// Not intended for restoring default value at later time. -pxRadioPanel& pxRadioPanel::SetDefaultItem(int idx) -{ - if (idx == m_DefaultIdx) - return *this; - - if (m_IsRealized && m_DefaultIdx != -1) - { - wxFont def(GetFont()); - m_objects[m_DefaultIdx].LabelObj->SetFont(def); - m_objects[m_DefaultIdx].LabelObj->SetForegroundColour(GetForegroundColour()); - } - - m_DefaultIdx = idx; - _RealizeDefaultOption(); - - return *this; -} - -pxRadioPanel& pxRadioPanel::EnableItem(int idx, bool enable) -{ - pxAssertDev(m_IsRealized, "RadioPanel must be realized first, prior to enabling or disabling individual items."); - - if (m_objects[idx].LabelObj) - m_objects[idx].LabelObj->Enable(enable); - - if (m_objects[idx].SubTextObj) - m_objects[idx].SubTextObj->Enable(enable); - - return *this; -} - -const RadioPanelItem& pxRadioPanel::Item(int idx) const -{ - return m_buttonStrings[idx]; -} - -RadioPanelItem& pxRadioPanel::Item(int idx) -{ - return m_buttonStrings[idx]; -} - -int pxRadioPanel::GetSelection() const -{ - if (!VerifyRealizedState()) - return 0; - - for (uint i = 0; i < m_buttonStrings.size(); ++i) - { - if (wxRadioButton* woot = m_objects[i].LabelObj) - if (woot->GetValue()) - return i; - } - - // Technically radio buttons should never allow for a case where none are selected. - // However it *can* happen on some platforms if the program code doesn't explicitly - // select one of the members of the group (which is, as far as I'm concerned, a - // programmer error!). so Assert here in such cases, and return 0 as the assumed - // default, so that calling code has a "valid" return code in release builds. - - pxFailDev("No valid selection was found in this group!"); - return 0; -} - -// Returns the wxWindowID for the currently selected radio button. -wxWindowID pxRadioPanel::GetSelectionId() const -{ - if (!VerifyRealizedState()) - return 0; - return m_objects[GetSelection()].LabelObj->GetId(); -} - - -bool pxRadioPanel::IsSelected(int idx) const -{ - if (!VerifyRealizedState()) - return false; - pxAssert(m_objects[idx].LabelObj != NULL); - return m_objects[idx].LabelObj->GetValue(); -} - -pxStaticText* pxRadioPanel::GetSubText(int idx) -{ - if (!VerifyRealizedState()) - return NULL; - return m_objects[idx].SubTextObj; -} - -const pxStaticText* pxRadioPanel::GetSubText(int idx) const -{ - if (!VerifyRealizedState()) - return NULL; - return m_objects[idx].SubTextObj; -} - -wxRadioButton* pxRadioPanel::GetButton(int idx) -{ - if (!VerifyRealizedState()) - return NULL; - return m_objects[idx].LabelObj; -} - -const wxRadioButton* pxRadioPanel::GetButton(int idx) const -{ - if (!VerifyRealizedState()) - return NULL; - return m_objects[idx].LabelObj; -} diff --git a/pcsx2/gui/pxRadioPanel.h b/pcsx2/gui/pxRadioPanel.h deleted file mode 100644 index 08828c0ce7..0000000000 --- a/pcsx2/gui/pxRadioPanel.h +++ /dev/null @@ -1,176 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include "common/SafeArray.h" -#include "gui/wxGuiTools.h" - -// -------------------------------------------------------------------------------------- -// RadioPanelItem -// -------------------------------------------------------------------------------------- - -struct RadioPanelItem -{ - wxString Label; - wxString SubText; - wxString ToolTip; - - int SomeInt; - void* SomePtr; - - RadioPanelItem(const wxString& label, const wxString& subtext = wxEmptyString, const wxString& tooltip = wxEmptyString) - : Label(label) - , SubText(subtext) - , ToolTip(tooltip) - { - SomeInt = 0; - SomePtr = NULL; - } - - RadioPanelItem& SetToolTip(const wxString& tip) - { - ToolTip = tip; - return *this; - } - - RadioPanelItem& SetSubText(const wxString& text) - { - SubText = text; - return *this; - } - - RadioPanelItem& SetInt(int intval) - { - SomeInt = intval; - return *this; - } - - RadioPanelItem& SetPtr(void* ptrval) - { - SomePtr = ptrval; - return *this; - } -}; - - -// Used as a cache for the "original" labels and subtexts, so that text can be properly -// wrapped and re-wrapped with multiple calls to OnResize(). -struct RadioPanelObjects -{ - wxRadioButton* LabelObj; - pxStaticText* SubTextObj; -}; - -// -------------------------------------------------------------------------------------- -// pxRadioPanel -// -------------------------------------------------------------------------------------- -// -// Rationale: -// Radio buttons work best when they are created consecutively, and then their subtext -// created in a second sweep (this keeps the radio buttons together in the parent window's -// child list, and avoids potentially unwanted behavior with radio buttons failing to -// group expectedly). Because of this, our radio button helper is shaped as a panel of -// a group of radio buttons only, instead of bothering with the lower level per-button -// design. This makes a few other things nicer as well, such as binding a single message -// handler to all radio buttons in the panel. -// -class pxRadioPanel : public wxPanelWithHelpers -{ -protected: - typedef std::vector ButtonArray; - typedef SafeArray ButtonObjArray; - - ButtonArray m_buttonStrings; - ButtonObjArray m_objects; - - bool m_IsRealized; - - wxSize m_padding; - int m_Indentation; - int m_DefaultIdx; // index of the default option (gets specific color/font treatment) - -public: - template - pxRadioPanel(wxWindow* parent, const RadioPanelItem (&src)[size]) - : wxPanelWithHelpers(parent, wxVERTICAL) - { - Init(src, size); - } - - pxRadioPanel(wxWindow* parent) - : wxPanelWithHelpers(parent, wxVERTICAL) - { - Init(); - } - - virtual ~pxRadioPanel() = default; - - void Reset(); - void Realize(); - - pxStaticText* GetSubText(int idx); - const pxStaticText* GetSubText(int idx) const; - pxRadioPanel& Append(const RadioPanelItem& entry); - - pxRadioPanel& SetToolTip(int idx, const wxString& tip); - pxRadioPanel& SetSelection(int idx); - pxRadioPanel& SetDefaultItem(int idx); - pxRadioPanel& EnableItem(int idx, bool enable = true); - - const RadioPanelItem& Item(int idx) const; - RadioPanelItem& Item(int idx); - - int GetSelection() const; - wxWindowID GetSelectionId() const; - bool IsSelected(int idx) const; - - const RadioPanelItem& SelectedItem() const { return Item(GetSelection()); } - RadioPanelItem& SelectedItem() { return Item(GetSelection()); } - - wxRadioButton* GetButton(int idx); - const wxRadioButton* GetButton(int idx) const; - - int GetPaddingVert() const { return m_padding.GetHeight(); } - int GetIndentation() const { return m_Indentation; } - - pxRadioPanel& SetPaddingHoriz(int newpad) - { - m_padding.SetHeight(newpad); - return *this; - } - - pxRadioPanel& SetIndentation(int newdent) - { - m_Indentation = newdent; - return *this; - } - - bool HasSubText(int idx) const - { - return !m_buttonStrings[idx].SubText.IsEmpty(); - } - - pxRadioPanel& Append(const wxString& label, const wxString& subtext = wxEmptyString, const wxString& tooltip = wxEmptyString) - { - return Append(RadioPanelItem(label, subtext, tooltip)); - } - -protected: - void Init(const RadioPanelItem* srcArray = NULL, int arrsize = 0); - void _setToolTipImmediate(int idx, const wxString& tip); - void _RealizeDefaultOption(); -}; diff --git a/pcsx2/gui/pxStaticText.cpp b/pcsx2/gui/pxStaticText.cpp deleted file mode 100644 index 62709890fd..0000000000 --- a/pcsx2/gui/pxStaticText.cpp +++ /dev/null @@ -1,335 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include -#include "common/Assertions.h" -#include "gui/pxStaticText.h" - -// -------------------------------------------------------------------------------------- -// pxStaticText (implementations) -// -------------------------------------------------------------------------------------- -pxStaticText::pxStaticText(wxWindow* parent) - : _parent(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER) -{ - m_align = wxALIGN_CENTRE_HORIZONTAL; - m_autowrap = true; - m_wrappedWidth = -1; - m_heightInLines = 1; - - SetPaddingDefaults(); -} - -pxStaticText::pxStaticText(wxWindow* parent, const wxString& label, wxAlignment align) - : _parent(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER) -{ - m_heightInLines = 1; - m_align = align; - - SetPaddingDefaults(); - Init(label); -} - -void pxStaticText::Init(const wxString& label) -{ - m_autowrap = true; - m_wrappedWidth = -1; - m_label = label; - Bind(wxEVT_PAINT, &pxStaticText::paintEvent, this); -} - -// we need to refresh the window after changing its size as the standard -// control doesn't always update itself properly (fials typically on window resizes where -// the control is expanded to fit -- ie the control's size changes but the position does not) -void pxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags) -{ - _parent::DoSetSize(x, y, w, h, sizeFlags); - Refresh(); -} - -void pxStaticText::SetPaddingDefaults() -{ - m_paddingPix_horiz = 7; - m_paddingPix_vert = 1; - - m_paddingPct_horiz = 0.0f; - m_paddingPct_vert = 0.0f; -} - -pxStaticText& pxStaticText::SetMinWidth(int width) -{ - SetMinSize(wxSize(width, GetMinHeight())); - return *this; -} - -pxStaticText& pxStaticText::SetMinHeight(int height) -{ - SetMinSize(wxSize(GetMinWidth(), height)); - return *this; -} - -pxStaticText& pxStaticText::SetHeight(int lines) -{ - if (!pxAssert(lines > 0)) - lines = 2; - m_heightInLines = lines; - - const int newHeight = (pxGetCharHeight(this) * m_heightInLines) + (m_paddingPix_vert * 2); - SetMinSize(wxSize(GetMinWidth(), newHeight)); - - return *this; -} - -pxStaticText& pxStaticText::Align(wxAlignment align) -{ - m_align = align; - return *this; -} - -pxStaticText& pxStaticText::Bold() -{ - wxFont bold(GetFont()); - bold.SetWeight(wxFONTWEIGHT_BOLD); - SetFont(bold); - return *this; -} - -pxStaticText& pxStaticText::Unwrapped() -{ - m_autowrap = false; - UpdateWrapping(false); - return *this; -} - -int pxStaticText::calcPaddingWidth(int newWidth) const -{ - return (int)(newWidth * m_paddingPct_horiz * 2) + (m_paddingPix_horiz * 2); -} - -int pxStaticText::calcPaddingHeight(int newHeight) const -{ - return (int)(newHeight * m_paddingPct_vert * 2) + (m_paddingPix_vert * 2); -} - -// Overloaded form wxPanel and friends. -wxSize pxStaticText::DoGetBestSize() const -{ - wxClientDC dc(const_cast(this)); - dc.SetFont(GetFontOk()); - - wxSize best; - - if (m_autowrap) - { - best = GetBestWrappedSize(dc); - //best.x = wxDefaultCoord; - } - else - { - // No autowrapping, so we can force a specific size here! - best = dc.GetMultiLineTextExtent(GetLabel()); - best.x += calcPaddingWidth(best.x); - } - - best.y += calcPaddingHeight(best.y); - - CacheBestSize(best); - return best; -} - -wxSize pxStaticText::GetBestWrappedSize(const wxClientDC& dc) const -{ - pxAssert(m_autowrap); - - // Find an ideal(-ish) width, based on a search of all parent controls and their - // valid Minimum sizes. - - int idealWidth = wxDefaultCoord; - int parentalAdjust = 0; - double parentalFactor = 1.0; - const wxWindow* millrun = this; - - while (millrun) - { - // IMPORTANT : wxWizard changes its min size and then expects everything else - // to play nice and NOT resize according to the new min size. (wtf stupid) - // Anyway, this fixes it -- ignore min size specifier on wxWizard! - if (wxIsKindOf(millrun, wxWizard)) - break; - - int min = (int)((millrun->GetMinWidth() - parentalAdjust) * parentalFactor); - - if (min > 0 && ((idealWidth < 0) || (min < idealWidth))) - { - idealWidth = min; - } - - parentalAdjust += pxSizerFlags::StdPadding * 2; - millrun = millrun->GetParent(); - } - - if (idealWidth <= 0) - { - // FIXME: The minimum size of this control is unknown, so let's just pick a guess based on - // the size of the user's display area. - - idealWidth = (int)(wxGetDisplaySize().GetWidth() * 0.66) - (parentalAdjust * 2); - } - - return dc.GetMultiLineTextExtent(pxTextWrapper().Wrap(this, m_label, idealWidth - calcPaddingWidth(idealWidth)).GetResult()); -} - -bool pxStaticText::_updateWrapping(bool textChanged) -{ - if (!m_autowrap) - { - //m_wrappedLabel = wxEmptyString; - //m_wrappedWidth = -1; - return false; - } - - wxString wrappedLabel; - int newWidth = GetSize().GetWidth(); - - if (!textChanged && (newWidth == m_wrappedWidth)) - return false; - - // Note: during various stages of sizer-calc, width can be 1, 0, or -1. - // We ignore wrapping in these cases. (the PaintEvent also checks the wrapping - // and updates it if needed, in case the control's size isn't figured out prior - // to being painted). - - m_wrappedWidth = newWidth; - if (m_wrappedWidth > 1) - wrappedLabel = pxTextWrapper().Wrap(this, m_label, m_wrappedWidth).GetResult(); - - if (m_wrappedLabel == wrappedLabel) - return false; - m_wrappedLabel = wrappedLabel; - - return true; -} - -void pxStaticText::UpdateWrapping(bool textChanged) -{ - if (_updateWrapping(textChanged)) - Refresh(); -} - -void pxStaticText::SetLabel(const wxString& label) -{ - const bool labelChanged(label != m_label); - if (labelChanged) - { - m_label = label; - Refresh(); - } - - // Always update wrapping, in case window width or something else also changed. - UpdateWrapping(labelChanged); - InvalidateBestSize(); -} - -wxFont pxStaticText::GetFontOk() const -{ - wxFont font(GetFont()); - if (!font.Ok()) - return wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - return font; -} - -bool pxStaticText::Enable(bool enabled) -{ - if (_parent::Enable(enabled)) - { - Refresh(); - return true; - } - return false; -} - -void pxStaticText::paintEvent(wxPaintEvent& evt) -{ - wxPaintDC dc(this); - const int dcWidth = dc.GetSize().GetWidth(); - const int dcHeight = dc.GetSize().GetHeight(); - if (dcWidth < 1) - return; - dc.SetFont(GetFontOk()); - - if (IsEnabled()) - dc.SetTextForeground(GetForegroundColour()); - else - dc.SetTextForeground(*wxLIGHT_GREY); - - pxWindowTextWriter writer(dc); - writer.Align(m_align); - - const wxString& label(m_autowrap ? m_wrappedLabel : m_label); - if (m_autowrap) - _updateWrapping(false); - - int tWidth, tHeight; - dc.GetMultiLineTextExtent(label, &tWidth, &tHeight); - - writer.Align(m_align); - if (m_align & wxALIGN_CENTER_VERTICAL) - writer.SetY((dcHeight - tHeight) / 2); - else - writer.SetY((int)(dcHeight * m_paddingPct_vert) + m_paddingPix_vert); - - writer.WriteLn(label); // without formatting please. - - //dc.SetBrush( *wxTRANSPARENT_BRUSH ); - //dc.DrawRectangle(wxPoint(), dc.GetSize()); -} - -// -------------------------------------------------------------------------------------- -// pxStaticHeading (implementations) -// -------------------------------------------------------------------------------------- -pxStaticHeading::pxStaticHeading(wxWindow* parent, const wxString& label) - : _parent(parent) -{ - m_align = wxALIGN_CENTER; - - SetPaddingDefaults(); - Init(label); -} - -void pxStaticHeading::SetPaddingDefaults() -{ - m_paddingPix_horiz = 4; - m_paddingPix_vert = 1; - - m_paddingPct_horiz = 0.08f; - m_paddingPct_vert = 0.0f; -} - -void operator+=(wxSizer& target, pxStaticText* src) -{ - if (src) - target.Add(src, pxExpand); -} - -void operator+=(wxSizer& target, pxStaticText& src) -{ - target.Add(&src, pxExpand); -} - -void operator+=(wxSizer* target, pxStaticText& src) -{ - target->Add(&src, pxExpand); -} diff --git a/pcsx2/gui/pxStaticText.h b/pcsx2/gui/pxStaticText.h deleted file mode 100644 index 8aeaedb958..0000000000 --- a/pcsx2/gui/pxStaticText.h +++ /dev/null @@ -1,117 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include "wxGuiTools.h" - -// -------------------------------------------------------------------------------------- -// pxStaticText -// -------------------------------------------------------------------------------------- -// This class's purpose is to overcome two fundamental annoyances in wxWidgets design: -// -// * An inability to wrap text to conform to a fitted window (a limitation imposed by -// wxWidgets inability to fit individual directions, ie fit widths and then fit heights, -// which would allow a textbox to wrap text to a sizer-determined width, and then grow -// the sizers vertically to fit the calculated text-wrapped height). -// -// * Textbox alignment requires aligning both the textbox contents, and aligning the text -// control within it's containing sizer. If both alignment flags do not match the result -// is typically undesirable. -// -class pxStaticText : public wxControl -{ - typedef wxControl _parent; - -protected: - wxString m_label; - wxString m_wrappedLabel; - - wxAlignment m_align; - bool m_autowrap; - int m_wrappedWidth; - int m_heightInLines; - - int m_paddingPix_horiz; - int m_paddingPix_vert; - float m_paddingPct_horiz; - float m_paddingPct_vert; - -protected: - explicit pxStaticText(wxWindow* parent = NULL); - - // wxWindow overloads! - bool AcceptsFocus() const { return false; } - bool HasTransparentBackground() { return true; } - void DoSetSize(int x, int y, int w, int h, int sizeFlags = wxSIZE_AUTO); - wxSize DoGetBestSize() const; - -public: - pxStaticText(wxWindow* parent, const wxString& label, wxAlignment align = wxALIGN_CENTRE_HORIZONTAL); - pxStaticText(wxWindow* parent, int heightInLines, const wxString& label, wxAlignment align = wxALIGN_CENTRE_HORIZONTAL); - virtual ~pxStaticText() = default; - - wxFont GetFontOk() const; - bool Enable(bool enabled = true); - - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const { return m_label; } - - pxStaticText& SetMinWidth(int width); - pxStaticText& SetMinHeight(int height); - - pxStaticText& SetHeight(int lines); - pxStaticText& Align(wxAlignment align); - pxStaticText& Bold(); - - pxStaticText& Unwrapped(); - -protected: - void SetPaddingDefaults(); - void Init(const wxString& label); - - wxSize GetBestWrappedSize(const wxClientDC& dc) const; - - int calcPaddingWidth(int newWidth) const; - int calcPaddingHeight(int newHeight) const; - - void paintEvent(wxPaintEvent& evt); - - void UpdateWrapping(bool textChanged); - bool _updateWrapping(bool textChanged); -}; - - -class pxStaticHeading : public pxStaticText -{ - typedef pxStaticText _parent; - -public: - pxStaticHeading(wxWindow* parent = NULL, const wxString& label = wxEmptyString); - pxStaticHeading(wxWindow* parent, int heightInLines, const wxString& label = wxEmptyString); - virtual ~pxStaticHeading() = default; - -protected: - void SetPaddingDefaults(); -}; - -extern void operator+=(wxSizer& target, pxStaticText& src); - -template <> -inline void operator+=(wxSizer& target, const pxWindowAndFlags& src) -{ - target.Add(src.window, src.flags); -} diff --git a/pcsx2/gui/pxTranslate.cpp b/pcsx2/gui/pxTranslate.cpp deleted file mode 100644 index cb7c23daaf..0000000000 --- a/pcsx2/gui/pxTranslate.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include - -bool pxIsEnglish(int id) -{ - return (id == wxLANGUAGE_ENGLISH || id == wxLANGUAGE_ENGLISH_US); -} - -// -------------------------------------------------------------------------------------- -// pxExpandMsg -- an Iconized Text Translator -// Was replaced by a standard implementation of wxGetTranslation -// -------------------------------------------------------------------------------------- -const wxChar* pxExpandMsg(const wxChar* message) -{ - return wxGetTranslation(message).wc_str(); -} - -const wxChar* pxGetTranslation(const wxChar* message) -{ - return wxGetTranslation(message).wc_str(); -} diff --git a/pcsx2/gui/pxWindowTextWriter.cpp b/pcsx2/gui/pxWindowTextWriter.cpp deleted file mode 100644 index 17778eea5a..0000000000 --- a/pcsx2/gui/pxWindowTextWriter.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include -#include "gui/StringHelpers.h" -#include "gui/wxGuiTools.h" - -// -------------------------------------------------------------------------------------- -// pxWindowTextWriter Implementations -// -------------------------------------------------------------------------------------- -pxWindowTextWriter::pxWindowTextWriter(wxDC& dc) - : m_dc(dc) -{ - m_curpos = wxPoint(); - m_align = wxALIGN_CENTER; - m_leading = 0; - - OnFontChanged(); -} - -void pxWindowTextWriter::OnFontChanged() -{ -} - -pxWindowTextWriter& pxWindowTextWriter::SetWeight(wxFontWeight weight) -{ - wxFont curfont(m_dc.GetFont()); - curfont.SetWeight(weight); - m_dc.SetFont(curfont); - - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::SetStyle(wxFontStyle style) -{ - wxFont curfont(m_dc.GetFont()); - curfont.SetStyle(style); - m_dc.SetFont(curfont); - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::Normal() -{ - wxFont curfont(m_dc.GetFont()); - curfont.SetStyle(wxFONTSTYLE_NORMAL); - curfont.SetWeight(wxFONTWEIGHT_NORMAL); - m_dc.SetFont(curfont); - - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::SetPos(const wxPoint& pos) -{ - m_curpos = pos; - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::MovePos(const wxSize& delta) -{ - m_curpos += delta; - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::SetY(int ypos) -{ - m_curpos.y = ypos; - return *this; -} - -void pxWindowTextWriter::_DoWriteLn(const wxString& msg) -{ - int tWidth, tHeight; - m_dc.GetMultiLineTextExtent(msg, &tWidth, &tHeight); - - wxPoint dispos(m_curpos); - - if (m_align & wxALIGN_CENTER_HORIZONTAL) - { - dispos.x = (m_dc.GetSize().GetWidth() - tWidth) / 2; - } - else if (m_align & wxALIGN_RIGHT) - { - dispos.x = m_dc.GetSize().GetWidth() - tWidth; - } - - m_dc.DrawText(msg, dispos); - m_curpos.y += tHeight + m_leading; -} - -// Splits incoming multi-line strings into pieces, and dispatches each line individually -// to the text writer. -void pxWindowTextWriter::_DoWrite(const wxChar* msg) -{ - pxAssert(msg); - - wxArrayString parts; - SplitString(parts, msg, L'\n'); - - for (size_t i = 0; i < parts.GetCount(); ++i) - _DoWriteLn(parts[i]); -} - -pxWindowTextWriter& pxWindowTextWriter::SetFont(const wxFont& font) -{ - m_dc.SetFont(font); - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::Align(const wxAlignment& align) -{ - m_align = align; - m_curpos.x = 0; - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::WriteLn() -{ - _DoWriteLn(L""); - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::WriteLn(const wxChar* fmt) -{ - _DoWrite(fmt); - return *this; -} - -pxWindowTextWriter& pxWindowTextWriter::WriteLn(const wxString fmt) -{ - _DoWrite(fmt.wc_str()); - return *this; -} diff --git a/pcsx2/gui/wxAppWithHelpers.cpp b/pcsx2/gui/wxAppWithHelpers.cpp deleted file mode 100644 index 02a6367ad7..0000000000 --- a/pcsx2/gui/wxAppWithHelpers.cpp +++ /dev/null @@ -1,740 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "gui/wxAppWithHelpers.h" -#include "gui/PersistentThread.h" - -wxDEFINE_EVENT(pxEvt_StartIdleEventTimer, wxCommandEvent); -wxDEFINE_EVENT(pxEvt_DeleteObject, wxCommandEvent); -wxDEFINE_EVENT(pxEvt_DeleteThread, wxCommandEvent); -wxDEFINE_EVENT(pxEvt_InvokeAction, pxActionEvent); -wxDEFINE_EVENT(pxEvt_SynchronousCommand, pxSynchronousCommandEvent); - -wxIMPLEMENT_DYNAMIC_CLASS(pxSimpleEvent, wxEvent); - -ConsoleLogSource_App::ConsoleLogSource_App() -{ - static const TraceLogDescriptor myDesc = - { - "AppEvents", "App Events", - "Includes idle event processing and some other uncommon event usages."}; - - m_Descriptor = &myDesc; -} - -ConsoleLogSource_App pxConLog_App; - -// -------------------------------------------------------------------------------------- -// BaseDeletableObject Implementation -// -------------------------------------------------------------------------------------- -// This code probably deserves a better home. It's general purpose non-GUI code (the single -// wxApp/Gui dependency is in wxGuiTools.cpp for now). -// -bool BaseDeletableObject::MarkForDeletion() -{ - return !m_IsBeingDeleted.exchange(true); -} - -void BaseDeletableObject::DeleteSelf() -{ - if (MarkForDeletion()) - DoDeletion(); -} - -BaseDeletableObject::BaseDeletableObject() -{ -#ifdef _MSC_VER - // Bleh, this fails because _CrtIsValidHeapPointer calls HeapValidate on the - // pointer, but the pointer is a virtual base class, so it's not a valid block. >_< - //pxAssertDev( _CrtIsValidHeapPointer( this ), "BaseDeletableObject types cannot be created on the stack or as temporaries!" ); -#endif - - m_IsBeingDeleted.store(false, std::memory_order_relaxed); -} - -BaseDeletableObject::~BaseDeletableObject() -{ - AffinityAssert_AllowFrom_MainUI(); -} - -void BaseDeletableObject::DoDeletion() -{ - wxAppWithHelpers* app = wxDynamicCast(wxApp::GetInstance(), wxAppWithHelpers); - pxAssert(app != NULL); - app->DeleteObject(*this); -} - -// -------------------------------------------------------------------------------------- -// SynchronousActionState Implementations -// -------------------------------------------------------------------------------------- - -void SynchronousActionState::SetException(const BaseException& ex) -{ - m_exception = ScopedExcept(ex.Clone()); -} - -void SynchronousActionState::SetException(BaseException* ex) -{ - if (!m_posted) - { - m_exception = ScopedExcept(ex); - } - else if (wxTheApp) - { - // transport the exception to the main thread, since the message is fully - // asynchronous, or has already entered an asynchronous state. Message is sent - // as a non-blocking action since proper handling of user errors on async messages - // is *usually* to log/ignore it (hah), or to suspend emulation and issue a dialog - // box to the user. - - pxExceptionEvent ev(ex); - wxTheApp->AddPendingEvent(ev); - } -} - -void SynchronousActionState::RethrowException() const -{ - if (m_exception) - m_exception->Rethrow(); -} - -int SynchronousActionState::WaitForResult() -{ - m_sema.WaitNoCancel(); - RethrowException(); - return return_value; -} - -int SynchronousActionState::WaitForResult_NoExceptions() -{ - m_sema.WaitNoCancel(); - return return_value; -} - -void SynchronousActionState::PostResult(int res) -{ - return_value = res; - PostResult(); -} - -void SynchronousActionState::ClearResult() -{ - m_posted = false; - m_exception = NULL; -} - -void SynchronousActionState::PostResult() -{ - if (m_posted) - return; - m_posted = true; - m_sema.Post(); -} - -// -------------------------------------------------------------------------------------- -// pxActionEvent Implementations -// -------------------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(pxActionEvent, wxEvent); - -pxActionEvent::pxActionEvent(SynchronousActionState* sema, int msgtype) - : wxEvent(0, msgtype) -{ - m_state = sema; -} - -pxActionEvent::pxActionEvent(SynchronousActionState& sema, int msgtype) - : wxEvent(0, msgtype) -{ - m_state = &sema; -} - -pxActionEvent::pxActionEvent(const pxActionEvent& src) - : wxEvent(src) -{ - m_state = src.m_state; -} - -void pxActionEvent::SetException(const BaseException& ex) -{ - SetException(ex.Clone()); -} - -void pxActionEvent::SetException(BaseException* ex) -{ - ex->DiagMsg() = StringUtil::wxStringToUTF8String(GetClassInfo()->GetClassName()) + ex->DiagMsg(); - - if (!m_state) - { - ScopedExcept exptr(ex); // auto-delete it after handling. - ex->Rethrow(); - } - - m_state->SetException(ex); -} - -// -------------------------------------------------------------------------------------- -// pxSynchronousCommandEvent -// -------------------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(pxSynchronousCommandEvent, wxCommandEvent); - -pxSynchronousCommandEvent::pxSynchronousCommandEvent(SynchronousActionState* sema, wxEventType commandType, int winid) - : wxCommandEvent(pxEvt_SynchronousCommand, winid) -{ - m_sync = sema; - m_realEvent = commandType; -} - -pxSynchronousCommandEvent::pxSynchronousCommandEvent(SynchronousActionState& sema, wxEventType commandType, int winid) - : wxCommandEvent(pxEvt_SynchronousCommand) -{ - m_sync = &sema; - m_realEvent = commandType; -} - -pxSynchronousCommandEvent::pxSynchronousCommandEvent(SynchronousActionState* sema, const wxCommandEvent& evt) - : wxCommandEvent(evt) -{ - m_sync = sema; - m_realEvent = evt.GetEventType(); - SetEventType(pxEvt_SynchronousCommand); -} - -pxSynchronousCommandEvent::pxSynchronousCommandEvent(SynchronousActionState& sema, const wxCommandEvent& evt) - : wxCommandEvent(evt) -{ - m_sync = &sema; - m_realEvent = evt.GetEventType(); - SetEventType(pxEvt_SynchronousCommand); -} - -pxSynchronousCommandEvent::pxSynchronousCommandEvent(const pxSynchronousCommandEvent& src) - : wxCommandEvent(src) -{ - m_sync = src.m_sync; - m_realEvent = src.m_realEvent; -} - -void pxSynchronousCommandEvent::SetException(const BaseException& ex) -{ - if (!m_sync) - ex.Rethrow(); - m_sync->SetException(ex); -} - -void pxSynchronousCommandEvent::SetException(BaseException* ex) -{ - if (!m_sync) - { - ScopedExcept exptr(ex); // auto-delete it after handling. - ex->Rethrow(); - } - - m_sync->SetException(ex); -} - -// -------------------------------------------------------------------------------------- -// pxRpcEvent -// -------------------------------------------------------------------------------------- -// Unlike pxPingEvent, the Semaphore belonging to this event is typically posted when the -// invoked method is completed. If the method can be executed in non-blocking fashion then -// it should leave the semaphore postback NULL. -// -class pxRpcEvent : public pxActionEvent -{ - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxRpcEvent); - - typedef pxActionEvent _parent; - -protected: - void (*m_Method)(); - -public: - virtual ~pxRpcEvent() = default; - virtual pxRpcEvent* Clone() const { return new pxRpcEvent(*this); } - - explicit pxRpcEvent(void (*method)() = NULL, SynchronousActionState* sema = NULL) - : pxActionEvent(sema) - { - m_Method = method; - } - - explicit pxRpcEvent(void (*method)(), SynchronousActionState& sema) - : pxActionEvent(sema) - { - m_Method = method; - } - - pxRpcEvent(const pxRpcEvent& src) - : pxActionEvent(src) - { - m_Method = src.m_Method; - } - - void SetMethod(void (*method)()) - { - m_Method = method; - } - -protected: - void InvokeEvent() - { - if (m_Method) - m_Method(); - } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(pxRpcEvent, pxActionEvent); - -// -------------------------------------------------------------------------------------- -// pxExceptionEvent implementations -// -------------------------------------------------------------------------------------- -pxExceptionEvent::pxExceptionEvent(const BaseException& ex) -{ - m_except = ex.Clone(); -} - -void pxExceptionEvent::InvokeEvent() -{ - ScopedExcept deleteMe(m_except); - if (deleteMe) - deleteMe->Rethrow(); -} - -// -------------------------------------------------------------------------------------- -// wxAppWithHelpers Implementation -// -------------------------------------------------------------------------------------- -// -// TODO : Ping dispatch and IdleEvent dispatch can be unified into a single dispatch, which -// would mean checking only one list of events per idle event, instead of two. (ie, ping -// events can be appended to the idle event list, instead of into their own custom list). -// -wxIMPLEMENT_DYNAMIC_CLASS(wxAppWithHelpers, wxApp); - - -// Posts a method to the main thread; non-blocking. Post occurs even when called from the -// main thread. -void wxAppWithHelpers::PostMethod(FnType_Void* method) -{ - PostEvent(pxRpcEvent(method)); -} - -// Posts a method to the main thread; non-blocking. Post occurs even when called from the -// main thread. -void wxAppWithHelpers::PostIdleMethod(FnType_Void* method) -{ - pxRpcEvent evt(method); - AddIdleEvent(evt); -} - -// Invokes the specified void method, or posts the method to the main thread if the calling -// thread is not Main. Action is blocking. For non-blocking method execution, use -// AppRpc_TryInvokeAsync. -// -// This function works something like setjmp/longjmp, in that the return value indicates if the -// function actually executed the specified method or not. -// -// Returns: -// FALSE if the method was not invoked (meaning this IS the main thread!) -// TRUE if the method was invoked. -// - -bool wxAppWithHelpers::Rpc_TryInvoke(FnType_Void* method) -{ - if (wxThread::IsMain()) - return false; - - SynchronousActionState sync; - PostEvent(pxRpcEvent(method, sync)); - sync.WaitForResult(); - - return true; -} - -// Invokes the specified void method, or posts the method to the main thread if the calling -// thread is not Main. Action is non-blocking (asynchronous). For blocking method execution, -// use AppRpc_TryInvoke. -// -// This function works something like setjmp/longjmp, in that the return value indicates if the -// function actually executed the specified method or not. -// -// Returns: -// FALSE if the method was not posted to the main thread (meaning this IS the main thread!) -// TRUE if the method was posted. -// -bool wxAppWithHelpers::Rpc_TryInvokeAsync(FnType_Void* method) -{ - if (wxThread::IsMain()) - return false; - PostEvent(pxRpcEvent(method)); - return true; -} - -void wxAppWithHelpers::ProcessMethod(FnType_Void* method) -{ - if (wxThread::IsMain()) - { - method(); - return; - } - - SynchronousActionState sync; - PostEvent(pxRpcEvent(method, sync)); - sync.WaitForResult(); -} - -void wxAppWithHelpers::PostEvent(const wxEvent& evt) -{ - // Const Cast is OK! - // Truth is, AddPendingEvent should be a const-qualified parameter, as - // it makes an immediate clone copy of the event -- but wxWidgets - // fails again in structured C/C++ design design. So I'm forcing it as such - // here. -- air - - _parent::AddPendingEvent(const_cast(evt)); -} - -bool wxAppWithHelpers::ProcessEvent(wxEvent& evt) -{ - // Note: We can't do an automatic blocking post of the message here, because wxWidgets - // isn't really designed for it (some events return data to the caller via the event - // struct, and posting the event would require a temporary clone, where changes would - // be lost). - - AffinityAssert_AllowFrom_MainUI(); - return _parent::ProcessEvent(evt); -} - -bool wxAppWithHelpers::ProcessEvent(wxEvent* evt) -{ - AffinityAssert_AllowFrom_MainUI(); - std::unique_ptr deleteMe(evt); - return _parent::ProcessEvent(*deleteMe); -} - -bool wxAppWithHelpers::ProcessEvent(pxActionEvent& evt) -{ - if (wxThread::IsMain()) - return _parent::ProcessEvent(evt); - else - { - SynchronousActionState sync; - evt.SetSyncState(sync); - AddPendingEvent(evt); - sync.WaitForResult(); - return true; - } -} - -bool wxAppWithHelpers::ProcessEvent(pxActionEvent* evt) -{ - if (wxThread::IsMain()) - { - std::unique_ptr deleteMe(evt); - return _parent::ProcessEvent(*deleteMe); - } - else - { - SynchronousActionState sync; - evt->SetSyncState(sync); - AddPendingEvent(*evt); - sync.WaitForResult(); - return true; - } -} - - -void wxAppWithHelpers::CleanUp() -{ - // I'm pretty sure the message pump is dead by now, which means we need to run through - // idle event list by hand and process the pending Deletion messages (all others can be - // ignored -- it's only deletions we want handled, and really we *could* ignore those too - // but I like to be tidy. -- air - - //IdleEventDispatcher( "CleanUp" ); - //DeletionDispatcher(); - _parent::CleanUp(); -} - -// Executes the event with exception handling. If the event throws an exception, the exception -// will be neatly packaged and transported back to the thread that posted the event. -// This function is virtual, however overloading it is not recommended. Derrived classes -// should overload InvokeEvent() instead. -void pxActionEvent::_DoInvokeEvent() -{ - AffinityAssert_AllowFrom_MainUI(); - - try - { - InvokeEvent(); - } - catch (BaseException& ex) - { - SetException(ex); - } - catch (std::runtime_error& ex) - { - SetException(new Exception::RuntimeError(ex)); - } - - if (m_state) - m_state->PostResult(); -} - -void wxAppWithHelpers::OnSynchronousCommand(pxSynchronousCommandEvent& evt) -{ - AffinityAssert_AllowFrom_MainUI(); - - pxAppLog.Write("(App) Executing command event synchronously..."); - evt.SetEventType(evt.GetRealEventType()); - - try - { - ProcessEvent(evt); - } - catch (BaseException& ex) - { - evt.SetException(ex); - } - catch (std::runtime_error& ex) - { - evt.SetException(new Exception::RuntimeError(ex, StringUtil::wxStringToUTF8String(evt.GetClassInfo()->GetClassName()).c_str())); - } - - if (Semaphore* sema = evt.GetSemaphore()) - sema->Post(); -} - -void wxAppWithHelpers::AddIdleEvent(const wxEvent& evt) -{ - ScopedLock lock(m_IdleEventMutex); - if (m_IdleEventQueue.empty()) - PostEvent(wxCommandEvent(pxEvt_StartIdleEventTimer)); - - m_IdleEventQueue.push_back(evt.Clone()); -} - -void wxAppWithHelpers::OnStartIdleEventTimer(wxCommandEvent& evt) -{ - ScopedLock lock(m_IdleEventMutex); - if (!m_IdleEventQueue.empty()) - m_IdleEventTimer.Start(100, true); -} - -void wxAppWithHelpers::IdleEventDispatcher(const wxChar* action) -{ - // Recursion is possible thanks to modal dialogs being issued from the idle event handler. - // (recursion shouldn't hurt anything anyway, since the node system re-creates the iterator - // on each pass) - - //static int __guard=0; - //RecursionGuard guard(__guard); - //if( !pxAssertDev(!guard.IsReentrant(), "Re-entrant call to IdleEventdispatcher caught on camera!") ) return; - - wxEventList postponed; - wxEventList::iterator node; - - ScopedLock lock(m_IdleEventMutex); - - while (node = m_IdleEventQueue.begin(), node != m_IdleEventQueue.end()) - { - std::unique_ptr deleteMe(*node); - m_IdleEventQueue.erase(node); - - lock.Release(); - if (!Threading::AllowDeletions() && (deleteMe->GetEventType() == pxEvt_DeleteThread)) - { - // Threads that have active semaphores or mutexes (other threads are waiting on them) cannot - // be deleted because those mutex/sema objects will become invalid and cause the pending - // thread to crash. So we disallow deletions when those waits are in action, and continue - // to postpone the deletion of the thread until such time that it is safe. - - pxThreadLog.Write(((pxThread*)((wxCommandEvent*)deleteMe.get())->GetClientData())->GetName(), L"Deletion postponed due to mutex or semaphore dependency."); - postponed.push_back(deleteMe.release()); - } - else - { - pxAppLog.Write("(AppIdleQueue%s) Dispatching event '%ls'", action, deleteMe->GetClassInfo()->GetClassName()); - ProcessEvent(*deleteMe); // dereference to prevent auto-deletion by ProcessEvent - } - lock.Acquire(); - } - - m_IdleEventQueue = postponed; - if (!m_IdleEventQueue.empty()) - pxAppLog.Write("(AppIdleQueue%s) %d events postponed due to dependencies.", action, m_IdleEventQueue.size()); -} - -void wxAppWithHelpers::OnIdleEvent(wxIdleEvent& evt) -{ - m_IdleEventTimer.Stop(); - IdleEventDispatcher(); -} - -void wxAppWithHelpers::OnIdleEventTimeout(wxTimerEvent& evt) -{ - IdleEventDispatcher(L"[Timeout]"); -} - -void wxAppWithHelpers::Ping() -{ - pxThreadLog.Write(pxGetCurrentThreadName().c_str(), L"App Event Ping Requested."); - - SynchronousActionState sync; - pxActionEvent evt(sync); - AddIdleEvent(evt); - sync.WaitForResult(); -} - -void wxAppWithHelpers::PostCommand(void* clientData, int evtType, int intParam, long longParam, const wxString& stringParam) -{ - wxCommandEvent evt(evtType); - evt.SetClientData(clientData); - evt.SetInt(intParam); - evt.SetExtraLong(longParam); - evt.SetString(stringParam); - AddPendingEvent(evt); -} - -void wxAppWithHelpers::PostCommand(int evtType, int intParam, long longParam, const wxString& stringParam) -{ - PostCommand(NULL, evtType, intParam, longParam, stringParam); -} - -sptr wxAppWithHelpers::ProcessCommand(void* clientData, int evtType, int intParam, long longParam, const wxString& stringParam) -{ - SynchronousActionState sync; - pxSynchronousCommandEvent evt(sync, evtType); - - evt.SetClientData(clientData); - evt.SetInt(intParam); - evt.SetExtraLong(longParam); - evt.SetString(stringParam); - AddPendingEvent(evt); - sync.WaitForResult(); - - return sync.return_value; -} - -sptr wxAppWithHelpers::ProcessCommand(int evtType, int intParam, long longParam, const wxString& stringParam) -{ - return ProcessCommand(NULL, evtType, intParam, longParam, stringParam); -} - -void wxAppWithHelpers::PostAction(const pxActionEvent& evt) -{ - PostEvent(evt); -} - -void wxAppWithHelpers::ProcessAction(pxActionEvent& evt) -{ - if (!wxThread::IsMain()) - { - SynchronousActionState sync; - evt.SetSyncState(sync); - AddPendingEvent(evt); - sync.WaitForResult(); - } - else - evt._DoInvokeEvent(); -} - - -void wxAppWithHelpers::DeleteObject(BaseDeletableObject& obj) -{ - pxAssert(!obj.IsBeingDeleted()); - wxCommandEvent evt(pxEvt_DeleteObject); - evt.SetClientData((void*)&obj); - AddIdleEvent(evt); -} - -void wxAppWithHelpers::DeleteThread(pxThread& obj) -{ - pxThreadLog.Write(obj.GetName(), L"Scheduling for deletion..."); - wxCommandEvent evt(pxEvt_DeleteThread); - evt.SetClientData((void*)&obj); - AddIdleEvent(evt); -} - -bool wxAppWithHelpers::OnInit() -{ - Bind(pxEvt_SynchronousCommand, &wxAppWithHelpers::OnSynchronousCommand, this); - Bind(pxEvt_InvokeAction, &wxAppWithHelpers::OnInvokeAction, this); - - Bind(pxEvt_StartIdleEventTimer, &wxAppWithHelpers::OnStartIdleEventTimer, this); - - Bind(pxEvt_DeleteObject, &wxAppWithHelpers::OnDeleteObject, this); - Bind(pxEvt_DeleteThread, &wxAppWithHelpers::OnDeleteThread, this); - - Bind(wxEVT_IDLE, &wxAppWithHelpers::OnIdleEvent, this); - - Bind(wxEVT_TIMER, &wxAppWithHelpers::OnIdleEventTimeout, this, m_IdleEventTimer.GetId()); - - return _parent::OnInit(); -} - -void wxAppWithHelpers::OnInvokeAction(pxActionEvent& evt) -{ - evt._DoInvokeEvent(); // wow this is easy! -} - -void wxAppWithHelpers::OnDeleteObject(wxCommandEvent& evt) -{ - if (evt.GetClientData() == NULL) - return; - delete (BaseDeletableObject*)evt.GetClientData(); -} - -// In theory we create a Pcsx2App object which inherit from wxAppWithHelpers, -// so Pcsx2App::CreateTraits must be used instead. -// -// However it doesn't work this way because wxAppWithHelpers constructor will -// be called first. This constructor will build some wx objects (here wxTimer) -// that require a trait. In others word, wxAppWithHelpers::CreateTraits will be -// called instead -wxAppTraits* wxAppWithHelpers::CreateTraits() -{ - return new Pcsx2AppTraits; -} - -// Threads have their own deletion handler that propagates exceptions thrown by the thread to the UI. -// (thus we have a fairly automatic threaded exception system!) -void wxAppWithHelpers::OnDeleteThread(wxCommandEvent& evt) -{ - std::unique_ptr thr((pxThread*)evt.GetClientData()); - if (!thr) - { - pxThreadLog.Write(L"null", L"OnDeleteThread: NULL thread object received (and ignored)."); - return; - } - - pxThreadLog.Write(thr->GetName(), wxString(wxString(L"Thread object deleted successfully") + (thr->HasPendingException() ? L" [exception pending!]" : L"")).wc_str()); - thr->RethrowException(); -} - -wxAppWithHelpers::wxAppWithHelpers() - : m_IdleEventTimer(this) -{ -#ifdef __WXMSW__ - // This variable assignment ensures that MSVC links in the TLS setup stubs even in - // full optimization builds. Without it, DLLs that use TLS won't work because the - // FS segment register won't have been initialized by the main exe, due to tls_insurance - // being optimized away >_< --air - - static thread_local int tls_insurance = 0; - tls_insurance = 1; -#endif -} diff --git a/pcsx2/gui/wxAppWithHelpers.h b/pcsx2/gui/wxAppWithHelpers.h deleted file mode 100644 index 31d4e4a234..0000000000 --- a/pcsx2/gui/wxAppWithHelpers.h +++ /dev/null @@ -1,193 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include - -#include "common/Threading.h" -#include "gui/pxEvents.h" -#include "gui/wxGuiTools.h" -#include "gui/AppTrait.h" - -using namespace Threading; - -class pxSynchronousCommandEvent; - -// -------------------------------------------------------------------------------------- -// BaseDeletableObject -// -------------------------------------------------------------------------------------- -// Oh the fruits and joys of multithreaded C++ coding conundrums! This class provides a way -// to be deleted from arbitraty threads, or to delete themselves (which is considered unsafe -// in C++, though it does typically work). It also gives objects a second recourse for -// doing fully virtualized cleanup, something C++ also makes impossible because of how it -// implements it's destructor hierarchy. -// -// To utilize virtual destruction, override DoDeletion() and be sure to invoke the base class -// implementation of DoDeletion(). -// -// Assertions: -// This class generates an assertion of the destructor is called from anything other than -// the main/gui thread. -// -// Rationale: -// wxWidgets provides a pending deletion feature, but it's specific to wxCore (not wxBase) -// which means it requires wxApp and all that, which is bad for plugins and the possibility -// of linking PCSX2 core against a non-WX gui in the future. It's also not thread safe -// (sigh). And, finally, it requires quite a bit of red tape to implement wxObjects because -// of the wx-custom runtime type information. So I made my own. -// -class BaseDeletableObject -{ -protected: - std::atomic m_IsBeingDeleted; - -public: - BaseDeletableObject(); - virtual ~BaseDeletableObject(); - - virtual void DeleteSelf(); - virtual bool IsBeingDeleted() { return !!m_IsBeingDeleted; } - - // Returns FALSE if the object is already marked for deletion, or TRUE if the app - // should schedule the object for deletion. Only schedule if TRUE is returned, otherwise - // the object could get deleted twice if two threads try to schedule it at the same time. - bool MarkForDeletion(); - -protected: - // This function is GUI implementation dependent! It's implemented by PCSX2's AppHost, - // but if the SysCore is being linked to another front end, you'll need to implement this - // yourself. Most GUIs have built in message pumps. If a platform lacks one then you'll - // need to implement one yourself (yay?). - virtual void DoDeletion(); -}; - -// -------------------------------------------------------------------------------------- -// pxAppLog / ConsoleLogSource_App -// -------------------------------------------------------------------------------------- - -class ConsoleLogSource_App : public ConsoleLogSource -{ - typedef ConsoleLogSource _parent; - -public: - ConsoleLogSource_App(); -}; - -extern ConsoleLogSource_App pxConLog_App; - -#define pxAppLog pxConLog_App.IsActive() && pxConLog_App - - -// -------------------------------------------------------------------------------------- -// ModalButtonPanel -// -------------------------------------------------------------------------------------- -class ModalButtonPanel : public wxPanelWithHelpers -{ -public: - ModalButtonPanel(wxWindow* window, const MsgButtons& buttons); - virtual ~ModalButtonPanel() = default; - - virtual void AddActionButton(wxWindowID id); - virtual void AddCustomButton(wxWindowID id, const wxString& label); - - virtual void OnActionButtonClicked(wxCommandEvent& evt); -}; - -typedef std::list wxEventList; - -// -------------------------------------------------------------------------------------- -// wxAppWithHelpers -// -------------------------------------------------------------------------------------- -class wxAppWithHelpers : public wxApp -{ - typedef wxApp _parent; - - wxDECLARE_DYNAMIC_CLASS(wxAppWithHelpers); - -protected: - wxEventList m_IdleEventQueue; - Threading::MutexRecursive m_IdleEventMutex; - wxTimer m_IdleEventTimer; - -public: - wxAppWithHelpers(); - virtual ~wxAppWithHelpers() {} - - wxAppTraits* CreateTraits(); - - void CleanUp(); - - void DeleteObject(BaseDeletableObject& obj); - void DeleteObject(BaseDeletableObject* obj) - { - if (obj == NULL) - return; - DeleteObject(*obj); - } - - void DeleteThread(Threading::pxThread& obj); - void DeleteThread(Threading::pxThread* obj) - { - if (obj == NULL) - return; - DeleteThread(*obj); - } - - void PostCommand(void* clientData, int evtType, int intParam = 0, long longParam = 0, const wxString& stringParam = wxEmptyString); - void PostCommand(int evtType, int intParam = 0, long longParam = 0, const wxString& stringParam = wxEmptyString); - void PostMethod(FnType_Void* method); - void PostIdleMethod(FnType_Void* method); - void ProcessMethod(FnType_Void* method); - - bool Rpc_TryInvoke(FnType_Void* method); - bool Rpc_TryInvokeAsync(FnType_Void* method); - - sptr ProcessCommand(void* clientData, int evtType, int intParam = 0, long longParam = 0, const wxString& stringParam = wxEmptyString); - sptr ProcessCommand(int evtType, int intParam = 0, long longParam = 0, const wxString& stringParam = wxEmptyString); - - void ProcessAction(pxActionEvent& evt); - void PostAction(const pxActionEvent& evt); - - void Ping(); - bool OnInit(); - //int OnExit(); - - void AddIdleEvent(const wxEvent& evt); - - void PostEvent(const wxEvent& evt); - bool ProcessEvent(wxEvent& evt); - bool ProcessEvent(wxEvent* evt); - - bool ProcessEvent(pxActionEvent& evt); - bool ProcessEvent(pxActionEvent* evt); - -protected: - void IdleEventDispatcher(const wxChar* action = wxEmptyString); - - void OnIdleEvent(wxIdleEvent& evt); - void OnStartIdleEventTimer(wxCommandEvent& evt); - void OnIdleEventTimeout(wxTimerEvent& evt); - void OnDeleteObject(wxCommandEvent& evt); - void OnDeleteThread(wxCommandEvent& evt); - void OnSynchronousCommand(pxSynchronousCommandEvent& evt); - void OnInvokeAction(pxActionEvent& evt); -}; - -namespace Msgbox -{ - extern int ShowModal(BaseMessageBoxEvent& evt); - extern int ShowModal(const wxString& title, const wxString& content, const MsgButtons& buttons); -} // namespace Msgbox diff --git a/pcsx2/gui/wxDirName.h b/pcsx2/gui/wxDirName.h deleted file mode 100644 index 3083ae8f00..0000000000 --- a/pcsx2/gui/wxDirName.h +++ /dev/null @@ -1,234 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "common/Pcsx2Defs.h" - -#include - -#define g_MaxPath 255 // 255 is safer with antiquated Win32 ASCII APIs. - -// -------------------------------------------------------------------------------------- -// wxDirName -// -------------------------------------------------------------------------------------- -class wxDirName : protected wxFileName -{ -public: - explicit wxDirName(const wxFileName& src) - { - Assign(src.GetPath(), wxEmptyString); - } - - wxDirName() - : wxFileName() - { - } - wxDirName(const wxDirName& src) - : wxFileName(src) - { - } - explicit wxDirName(const char* src) { Assign(wxString(src, wxMBConvUTF8())); } - explicit wxDirName(const wxString& src) { Assign(src); } - - // ------------------------------------------------------------------------ - void Assign(const wxString& volume, const wxString& path) - { - wxFileName::Assign(volume, path, wxEmptyString); - } - - void Assign(const wxString& path) - { - wxFileName::Assign(path, wxEmptyString); - } - - void Assign(const wxDirName& path) - { - wxFileName::Assign(path); - } - - void Clear() { wxFileName::Clear(); } - - wxCharBuffer ToUTF8() const { return GetPath().ToUTF8(); } - wxCharBuffer ToAscii() const { return GetPath().ToAscii(); } - wxString ToString() const { return GetPath(); } - - // ------------------------------------------------------------------------ - bool IsWritable() const { return IsDirWritable(); } - bool IsReadable() const { return IsDirReadable(); } - bool Exists() const { return DirExists(); } - bool FileExists() const { return wxFileName::FileExists(); } - bool IsOk() const { return wxFileName::IsOk(); } - bool IsRelative() const { return wxFileName::IsRelative(); } - bool IsAbsolute() const { return wxFileName::IsAbsolute(); } - - bool SameAs(const wxDirName& filepath) const - { - return wxFileName::SameAs(filepath); - } - - //Returns true if the file is somewhere inside this directory (and both file and directory are not relative). - bool IsContains(const wxFileName& file) const - { - if (this->IsRelative() || file.IsRelative()) - return false; - - wxFileName f(file); - - while (1) - { - if (this->SameAs(wxDirName(f.GetPath()))) - return true; - - if (f.GetDirCount() == 0) - return false; - - f.RemoveLastDir(); - } - - return false; - } - - bool IsContains(const wxDirName& dir) const - { - return IsContains((wxFileName)dir); - } - - - //Auto relative works as follows: - // 1. if either base or subject are relative, return subject (should never be used with relative paths). - // 2. else if subject is somewhere inside base folder, then result is subject relative to base. - // 3. (windows only, implicitly) else if subject is on the same driveletter as base, result is absolute path of subject without the driveletter. - // 4. else, result is absolute path of subject. - // - // returns ok if both this and base are absolute paths. - static wxString MakeAutoRelativeTo(const wxFileName _subject, const wxString& pathbase) - { - wxFileName subject(_subject); - wxDirName base(pathbase); - if (base.IsRelative() || subject.IsRelative()) - return subject.GetFullPath(); - - wxString bv(base.GetVolume()); - bv.MakeUpper(); - wxString sv(subject.GetVolume()); - sv.MakeUpper(); - - if (base.IsContains(subject)) - { - subject.MakeRelativeTo(base.GetFullPath()); - } - else if (base.HasVolume() && subject.HasVolume() && bv == sv) - { - wxString unusedVolume; - wxString pathSansVolume; - subject.SplitVolume(subject.GetFullPath(), &unusedVolume, &pathSansVolume); - subject = pathSansVolume; - } - //implicit else: this stays fully absolute - - return subject.GetFullPath(); - } - - static wxString MakeAutoRelativeTo(const wxDirName subject, const wxString& pathbase) - { - return MakeAutoRelativeTo(wxFileName(subject), pathbase); - } - - // Returns the number of sub folders in this directory path - size_t GetCount() const { return GetDirCount(); } - - // ------------------------------------------------------------------------ - wxFileName Combine(const wxFileName& right) const; - wxDirName Combine(const wxDirName& right) const; - - // removes the lastmost directory from the path - void RemoveLast() { wxFileName::RemoveDir(GetCount() - 1); } - - wxDirName& Normalize(int flags = wxPATH_NORM_ALL, const wxString& cwd = wxEmptyString); - wxDirName& MakeRelativeTo(const wxString& pathBase = wxEmptyString); - wxDirName& MakeAbsolute(const wxString& cwd = wxEmptyString); - - // ------------------------------------------------------------------------ - - void AssignCwd(const wxString& volume = wxEmptyString) { wxFileName::AssignCwd(volume); } - bool SetCwd() { return wxFileName::SetCwd(); } - - // wxWidgets is missing the const qualifier for this one! Shame! - void Rmdir() const; - bool Mkdir() const; - - // ------------------------------------------------------------------------ - - wxDirName& operator=(const wxDirName& dirname) - { - Assign(dirname); - return *this; - } - wxDirName& operator=(const wxString& dirname) - { - Assign(dirname); - return *this; - } - wxDirName& operator=(const char* dirname) - { - Assign(wxString(dirname, wxMBConvUTF8())); - return *this; - } - - wxFileName operator+(const wxFileName& right) const { return Combine(right); } - wxDirName operator+(const wxDirName& right) const { return Combine(right); } - wxFileName operator+(const wxString& right) const { return Combine(wxFileName(right)); } - wxFileName operator+(const char* right) const { return Combine(wxFileName(wxString(right, wxMBConvUTF8()))); } - - bool operator==(const wxDirName& filename) const { return SameAs(filename); } - bool operator!=(const wxDirName& filename) const { return !SameAs(filename); } - - bool operator==(const wxFileName& filename) const { return SameAs(wxDirName(filename)); } - bool operator!=(const wxFileName& filename) const { return !SameAs(wxDirName(filename)); } - - // compare with a filename string interpreted as a native file name - bool operator==(const wxString& filename) const { return SameAs(wxDirName(filename)); } - bool operator!=(const wxString& filename) const { return !SameAs(wxDirName(filename)); } - - const wxFileName& GetFilename() const { return *this; } - wxFileName& GetFilename() { return *this; } -}; - -// -------------------------------------------------------------------------------------- -// Path Namespace -// -------------------------------------------------------------------------------------- -// Cross-platform utilities for manipulation of paths and filenames. Mostly these fall -// back on wxWidgets APIs internally, but are still helpful because some of wx's file stuff -// has minor glitches, or requires sloppy wxFileName typecasting. -// -namespace Path -{ - extern bool IsRelative(const wxString& path); - extern s64 GetFileSize(const wxString& path); - - extern wxString Normalize(const wxString& srcpath); - extern wxString Normalize(const wxDirName& srcpath); - extern wxString MakeAbsolute(const wxString& srcpath); - - extern wxString CombineWx(const wxString& srcPath, const wxString& srcFile); - extern wxString CombineWx(const wxDirName& srcPath, const wxFileName& srcFile); - extern wxString CombineWx(const wxString& srcPath, const wxDirName& srcFile); - extern wxString ReplaceFilename(const wxString& src, const wxString& newfilename); - extern wxString GetFilename(const wxString& src); - extern wxString GetDirectory(const wxString& src); - extern wxString GetFilenameWithoutExt(const wxString& src); - extern wxString GetRootDirectory(const wxString& src); -} // namespace Path diff --git a/pcsx2/gui/wxGuiTools.cpp b/pcsx2/gui/wxGuiTools.cpp deleted file mode 100644 index cc0f07790c..0000000000 --- a/pcsx2/gui/wxGuiTools.cpp +++ /dev/null @@ -1,652 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "gui/wxGuiTools.h" -#include "gui/pxStaticText.h" - -#include -#include -#include - -const pxAlignmentType - pxCentre = {pxAlignmentType::Center}, // Horizontal centered alignment - pxCenter = pxCentre, - pxMiddle = {pxAlignmentType::Middle}, // vertical centered alignment - - pxAlignLeft = {pxAlignmentType::Left}, - pxAlignRight = {pxAlignmentType::Right}, - pxAlignTop = {pxAlignmentType::Top}, - pxAlignBottom = {pxAlignmentType::Bottom}; - -const pxStretchType - pxShrink = {pxStretchType::Shrink}, - pxExpand = {pxStretchType::Expand}, - pxShaped = {pxStretchType::Shaped}, - pxReserveHidden = {pxStretchType::ReserveHidden}, - pxFixedMinimum = {pxStretchType::FixedMinimum}; - -wxSizerFlags pxAlignmentType::Apply(wxSizerFlags flags) const -{ - switch (intval) - { - case Centre: - flags.Align(flags.GetFlags() | wxALIGN_CENTRE_HORIZONTAL); - break; - - case Middle: - flags.Align(flags.GetFlags() | wxALIGN_CENTRE_VERTICAL); - break; - - case Left: - flags.Left(); - break; - - case Right: - flags.Right(); - break; - - case Top: - flags.Top(); - break; - - case Bottom: - flags.Bottom(); - break; - } - return flags; -} - -wxSizerFlags pxStretchType::Apply(wxSizerFlags flags) const -{ - switch (intval) - { - case Shrink: - //pxFail( "wxSHRINK is an ignored stretch flag." ); - break; - - case Expand: - flags.Expand(); - break; - - case Shaped: - flags.Shaped(); - break; - - case ReserveHidden: - flags.ReserveSpaceEvenIfHidden(); - break; - - case FixedMinimum: - flags.FixedMinSize(); - break; - - //case Tile: - // pxAssert( "pxTile is an unsupported stretch tag (ignored)." ); - //break; - } - return flags; -} - -wxSizerFlags operator&(const wxSizerFlags& _flgs, const wxSizerFlags& _flgs2) -{ - //return align.Apply( _flgs ); - wxSizerFlags retval; - - uint allflags = (_flgs.GetFlags() | _flgs2.GetFlags()); - - retval.Align(allflags & wxALIGN_MASK); - if (allflags & wxEXPAND) - retval.Expand(); - if (allflags & wxSHAPED) - retval.Shaped(); - if (allflags & wxFIXED_MINSIZE) - retval.FixedMinSize(); - if (allflags & wxRESERVE_SPACE_EVEN_IF_HIDDEN) - retval.ReserveSpaceEvenIfHidden(); - - // Compounding borders is probably a fair approach: - retval.Border(allflags & wxALL, _flgs.GetBorderInPixels() + _flgs2.GetBorderInPixels()); - - // Compounding proportions works as well, I figure. - retval.Proportion(_flgs.GetProportion() + _flgs2.GetProportion()); - - return retval; -} - -// ---------------------------------------------------------------------------- -// Reference/Handle versions! - -void operator+=(wxSizer& target, wxWindow* src) -{ - target.Add(src); -} - -void operator+=(wxSizer& target, wxSizer* src) -{ - target.Add(src); -} - -void operator+=(wxSizer& target, wxWindow& src) -{ - target.Add(&src); -} - -void operator+=(wxSizer& target, wxSizer& src) -{ - target.Add(&src); -} - -void operator+=(wxSizer& target, int spacer) -{ - target.AddSpacer(spacer); -} - -void operator+=(wxSizer& target, const pxStretchSpacer& spacer) -{ - target.AddStretchSpacer(spacer.proportion); -} - -void operator+=(wxWindow& target, int spacer) -{ - if (!pxAssert(target.GetSizer() != NULL)) - return; - target.GetSizer()->AddSpacer(spacer); -} - -void operator+=(wxWindow& target, const pxStretchSpacer& spacer) -{ - if (!pxAssert(target.GetSizer() != NULL)) - return; - target.GetSizer()->AddStretchSpacer(spacer.proportion); -} - -// ---------------------------------------------------------------------------- -// Pointer versions! (note that C++ requires one of the two operator params be a -// "poper" object type (non-pointer), so that's why there's only a couple of these. - -void operator+=(wxSizer* target, wxWindow& src) -{ - if (!pxAssert(target != NULL)) - return; - target->Add(&src); -} - -void operator+=(wxSizer* target, wxSizer& src) -{ - if (!pxAssert(target != NULL)) - return; - target->Add(&src); -} - -// ---------------------------------------------------------------------------- - -// Returns FALSE if the window position is considered invalid, which means that it's title -// bar is most likely not easily grabble. Such a window should be moved to a valid or -// default position. -bool pxIsValidWindowPosition(const wxWindow& window, const wxPoint& windowPos) -{ - // The height of the window is only revlevant to the height of a title bar, which is - // all we need visible for the user to be able to drag the window into view. But - // there's no way to get that info from wx, so we'll just have to guesstimate... - - const wxSize sizeMatters(window.GetSize().GetWidth(), 32); - - for (unsigned int i = 0; i < wxDisplay::GetCount(); i++) - { - const auto rect = wxDisplay(i).GetGeometry(); - - if (rect.Contains(wxRect(windowPos, sizeMatters))) - return true; - } - - return false; -} - -// Retrieves the area of the screen, which can be used to enforce a valid zone for -// window positioning. (top/left coords are almost always (0,0) and bottom/right -// is the resolution of the desktop). -wxRect wxGetDisplayArea() -{ - return wxRect(wxPoint(), wxGetDisplaySize()); -} - -// -------------------------------------------------------------------------------------- -// pxSizerFlags -// -------------------------------------------------------------------------------------- -// FlagsAccessors - Provides read-write copies of standard sizer flags for our interface. -// These standard definitions provide a consistent and pretty interface for our GUI. -// Without them things look compacted, misaligned, and yucky! -// -// Implementation Note: Accessors are all provisioned as dynamic (realtime) sizer calculations. -// I've preferred this over cstatic const variables on the premise that spacing logic could -// in the future become a dynamic value (currently it is affixed to 6 for most items). -// -wxSizerFlags pxSizerFlags::StdSpace() -{ - return wxSizerFlags().Border(wxALL, StdPadding); -} - -wxSizerFlags pxSizerFlags::StdCenter() -{ - return wxSizerFlags().Align(wxALIGN_CENTER).DoubleBorder(); -} - -wxSizerFlags pxSizerFlags::StdExpand() -{ - return StdSpace().Expand(); -} - -// A good sizer flags setting for top-level static boxes or top-level picture boxes. -// Gives a generous border to the left, right, and bottom. Top border can be configured -// manually by using a spacer. -wxSizerFlags pxSizerFlags::TopLevelBox() -{ - return pxBorder(wxLEFT | wxBOTTOM | wxRIGHT, StdPadding).Expand(); -} - -// Flags intended for use on grouped StaticBox controls. These flags are ideal for -// StaticBoxes that are part of sub-panels or children of other static boxes, but may -// not be best for parent StaticBoxes on dialogs (left and right borders feel a bit -// "tight"). -wxSizerFlags pxSizerFlags::SubGroup() -{ - // Groups look better with a slightly smaller margin than standard. - // (basically this accounts for the group's frame) - return pxBorder(wxLEFT | wxBOTTOM | wxRIGHT, StdPadding - 2).Expand(); -} - -// This force-aligns the std button sizer to the right, where (at least) us win32 platform -// users always expect it to be. Most likely Mac platforms expect it on the left side -// just because it's *not* where win32 sticks it. Too bad! -wxSizerFlags pxSizerFlags::StdButton() -{ - return pxBorder().Align(wxALIGN_RIGHT); -} - -wxSizerFlags pxSizerFlags::Checkbox() -{ - return StdExpand(); -} - -void pxSizerFlags::SetBestPadding() -{ - if (wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > 1024 && wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) > 864) - StdPadding = 4; - else - StdPadding = 1; -} - -// -------------------------------------------------------------------------------------- -// pxTextWrapper / pxTextWrapperBase (implementations) -// -------------------------------------------------------------------------------------- - -static bool is_cjk_char(const uint ch) -{ - /** - * You can check these range at http://unicode.org/charts/ - * see the "East Asian Scripts" part. - * Notice that not all characters in that part is still in use today, so don't list them all here. - */ - - // FIXME: add range from Japanese-specific and Korean-specific section if you know the - // characters are used today. - - if (ch < 0x2e80) - return false; // shortcut for common non-CJK - - return - // Han Ideographs: all except Supplement - (ch >= 0x4e00 && ch < 0x9fcf) || - (ch >= 0x3400 && ch < 0x4dbf) || - (ch >= 0x20000 && ch < 0x2a6df) || - (ch >= 0xf900 && ch < 0xfaff) || - (ch >= 0x3190 && ch < 0x319f) || - - // Radicals: all except Ideographic Description - (ch >= 0x2e80 && ch < 0x2eff) || - (ch >= 0x2f00 && ch < 0x2fdf) || - (ch >= 0x31c0 && ch < 0x31ef) || - - // Chinese-specific: Bopomofo - (ch >= 0x3000 && ch < 0x303f) || - - // Japanese-specific: Halfwidth Katakana - (ch >= 0xff00 && ch < 0xffef) || - - // Japanese-specific: Hiragana, Katakana - (ch >= 0x3040 && ch <= 0x309f) || - (ch >= 0x30a0 && ch <= 0x30ff) || - - // Korean-specific: Hangul Syllables, Halfwidth Jamo - (ch >= 0xac00 && ch < 0xd7af) || - (ch >= 0xff00 && ch < 0xffef); -} - -/* - * According to Kinsoku-Shori, Japanese rules about line-breaking: - * - * * the following characters cannot begin a line (so we will never break before them): - * ã€ã€‚，．）〕］ï½ã€‰ã€‹ã€ã€ã€‘’â€ã‚ゞヽヾ々？ï¼ï¼šï¼›ããƒã…ã‡ã‰ã‚ƒã‚…ょゎァィゥェォャュョヮã£ãƒµãƒƒãƒ¶ãƒ»â€¦ãƒ¼ - * - * * the following characters cannot end a line (so we will never break after them): - * （〔［｛〈《「『ã€â€˜â€œ - * - * Unicode range that concerns word wrap for Chinese: - * 全角ASCIIã€å…¨è§’中英文标点 (Fullwidth Character for ASCII, English punctuations and part of Chinese punctuations) - * http://www.unicode.org/charts/PDF/UFF00.pdf - * CJK æ ‡ç‚¹ç¬¦å· (CJK punctuations) - * http://www.unicode.org/charts/PDF/U3000.pdf - */ -static bool no_break_after(const uint ch) -{ - // clang-format off - switch (ch) { - /** - * don't break after these Japanese/Chinese characters - */ - case 0x2018: case 0x201c: case 0x3008: case 0x300a: - case 0x300c: case 0x300e: case 0x3010: case 0x3014: - case 0x3016: case 0x301a: case 0x301d: - case 0xff08: case 0xff3b: case 0xff5b: - - /** - * FIXME don't break after these Korean characters - */ - - return true; - } - // clang-format on - - return false; -} - -static bool no_break_before(const uint ch) -{ - // clang-format off - switch (ch) { - /** - * don't break before these Japanese characters - */ - case 0x2019: case 0x201d: case 0x2026: case 0x3001: case 0x3002: - case 0x3005: case 0x3009: case 0x300b: case 0x300d: case 0x300f: - case 0x301c: case 0x3011: case 0x3015: case 0x3017: case 0x301b: - case 0x301e: case 0x3041: case 0x3043: case 0x3045: - case 0x3047: case 0x3049: case 0x3063: case 0x3083: case 0x3085: - case 0x3087: case 0x308e: case 0x309d: case 0x309e: case 0x30a1: - case 0x30a3: case 0x30a5: case 0x30a7: case 0x30a9: case 0x30c3: - case 0x30e3: case 0x30e5: case 0x30e7: case 0x30ee: case 0x30f5: - case 0x30f6: case 0x30fb: case 0x30fc: case 0x30fd: case 0x30fe: - case 0xff01: case 0xff09: case 0xff0c: case 0xff0d: case 0xff0e: case 0xff1a: - case 0xff1b: case 0xff1f: case 0xff3d: case 0xff5d: case 0xff64: case 0xff65: - - /** - * FIXME don't break before these Korean characters - */ - - /** - * don't break before these Chinese characters - * contains - * many Chinese punctuations that should not start a line - * and right side of different kinds of brackets, quotes - */ - - return true; - } - // clang-format on - - return false; -} - -pxTextWrapperBase& pxTextWrapperBase::Wrap(const wxWindow& win, const wxString& text, int widthMax) -{ - if (text.empty()) - return *this; - - bool wasWrapped = false; - - wxString line; - line.reserve(text.length() + 12); - - wxString::const_iterator lastSpace = text.end(); - wxString::const_iterator lineStart = text.begin(); - for (wxString::const_iterator p = lineStart;; ++p) - { - if (IsStartOfNewLine()) - { - OnNewLine(); - - lastSpace = text.end(); - lineStart = p; - - if (wasWrapped) - line = m_indent; - else - line.clear(); - } - - if (p == text.end() || *p == L'\n') - { - wasWrapped = false; - DoOutputLine(line); - - if (p == text.end()) - break; - } - else - { // not EOL - if (is_cjk_char(*p)) - { - if (!no_break_before(*p)) - { - if (p == lineStart || !no_break_after(*(p - 1))) - lastSpace = p; - } - } - else if (*p == L' ' || *p == L',' || *p == L'/') - lastSpace = p; - - line += *p; - - if (widthMax >= 0 && lastSpace != text.end()) - { - int width; - win.GetTextExtent(line, &width, NULL); - - if (width > widthMax) - { - wasWrapped = true; - - // remove the last word from this line - line.erase(lastSpace - lineStart, p + 1 - lineStart); - DoOutputLine(line); - - // go back to the last word of this line which we didn't - // output yet - p = lastSpace; - - if (*p != L' ') - p--; - } - } - //else: no wrapping at all or impossible to wrap - } - } - - return *this; -} - -void pxTextWrapperBase::DoOutputLine(const wxString& line) -{ - OnOutputLine(line); - m_linecount++; - m_eol = true; -} - -// this function is a destructive inspector: when it returns true it also -// resets the flag to false so calling it again wouldn't return true any -// more -bool pxTextWrapperBase::IsStartOfNewLine() -{ - if (!m_eol) - return false; - - m_eol = false; - return true; -} - -pxTextWrapper& pxTextWrapper::Wrap(const wxWindow& win, const wxString& text, int widthMax) -{ - _parent::Wrap(win, text, widthMax); - return *this; -} - -pxTextWrapper& pxTextWrapper::Wrap(const wxWindow* win, const wxString& text, int widthMax) -{ - if (win) - _parent::Wrap(*win, text, widthMax); - return *this; -} - -void pxTextWrapper::OnOutputLine(const wxString& line) -{ - m_text += line; -} - -void pxTextWrapper::OnNewLine() -{ - m_text += L'\n'; -} - -// -------------------------------------------------------------------------------------- -// ScopedBusyCursor (implementations) -// -------------------------------------------------------------------------------------- - -std::stack ScopedBusyCursor::m_cursorStack; -BusyCursorType ScopedBusyCursor::m_defBusyType; - -ScopedBusyCursor::ScopedBusyCursor(BusyCursorType busytype) -{ - pxAssert(wxTheApp != NULL); - - BusyCursorType curtype = Cursor_NotBusy; - if (!m_cursorStack.empty()) - curtype = m_cursorStack.top(); - - if (curtype < busytype) - SetManualBusyCursor(curtype = busytype); - - m_cursorStack.push(curtype); -} - -ScopedBusyCursor::~ScopedBusyCursor() -{ - if (!pxAssert(wxTheApp != NULL)) - return; - - if (!pxAssert(!m_cursorStack.empty())) - { - SetManualBusyCursor(m_defBusyType); - return; - } - - BusyCursorType curtype = m_cursorStack.top(); - m_cursorStack.pop(); - - if (m_cursorStack.empty()) - SetManualBusyCursor(m_defBusyType); - else if (m_cursorStack.top() != curtype) - SetManualBusyCursor(m_cursorStack.top()); -} - -void ScopedBusyCursor::SetDefault(BusyCursorType busytype) -{ - if (busytype == m_defBusyType) - return; - m_defBusyType = busytype; - - if (m_cursorStack.empty()) - SetManualBusyCursor(busytype); -} - -void ScopedBusyCursor::SetManualBusyCursor(BusyCursorType busytype) -{ - switch (busytype) - { - case Cursor_NotBusy: - wxSetCursor(wxNullCursor); - break; - case Cursor_KindaBusy: - wxSetCursor(StockCursors.GetArrowWait()); - break; - case Cursor_ReallyBusy: - wxSetCursor(*wxHOURGLASS_CURSOR); - break; - } -} - -const wxCursor& MoreStockCursors::GetArrowWait() -{ - if (!m_arrowWait) - m_arrowWait = std::make_unique(wxCURSOR_ARROWWAIT); - return *m_arrowWait; -} - -MoreStockCursors StockCursors; - -// -------------------------------------------------------------------------------------- -// pxSetToolTip -// -------------------------------------------------------------------------------------- -// This is the preferred way to assign tooltips to wxWidgets-based objects. On Windows it -// extends the tooltip time to the maximum possible. GTK seems to have indefinite -// tooltips, I don't know about OS X. - -void pxSetToolTip(wxWindow* wind, const wxString& src) -{ - if (wind == NULL) - return; // Silently ignore nulls - wind->SetToolTip(src); - -// Make tooltips show for as long as possible on Windows. Linux (GTK) can -// show tooltips indefinitely. -#ifdef __WXMSW__ - wind->GetToolTip()->SetAutoPop(32767); -#endif -} - -void pxSetToolTip(wxWindow& wind, const wxString& src) -{ - pxSetToolTip(&wind, src); -} - - -wxFont pxGetFixedFont(int ptsize, wxFontWeight weight, bool underline) -{ - return wxFont( - ptsize, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, weight, underline -#ifdef __WXMSW__ - , - L"Lucida Console" // better than courier new (win32 only) -#endif - ); -} - - -wxString pxGetAppName() -{ - pxAssert(wxTheApp); - return wxTheApp->GetAppName(); -} diff --git a/pcsx2/gui/wxGuiTools.h b/pcsx2/gui/wxGuiTools.h deleted file mode 100644 index 6f0f89b62a..0000000000 --- a/pcsx2/gui/wxGuiTools.h +++ /dev/null @@ -1,831 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include -#include -#include "common/Assertions.h" -#include "common/Pcsx2Defs.h" - -// ---------------------------------------------------------------------------- -// wxGuiTools.h -// -// This file is meant to contain utility classes for users of the wxWidgets library. -// All classes in this file are dependent on wxBase and wxCore libraries! Meaning -// you will have to use wxCore header files and link against wxCore (GUI) to build -// them. For tools which require only wxBase, see wxBaseTools.h -// ---------------------------------------------------------------------------- - -class pxStaticText; -class pxStaticHeading; -class pxCheckBox; -class wxSpinCtrl; - -namespace pxSizerFlags -{ - static int StdPadding = 4; - - extern wxSizerFlags StdSpace(); - extern wxSizerFlags StdCenter(); - extern wxSizerFlags StdExpand(); - extern wxSizerFlags TopLevelBox(); - extern wxSizerFlags SubGroup(); - extern wxSizerFlags StdButton(); - extern wxSizerFlags Checkbox(); - extern void SetBestPadding(); -}; // namespace pxSizerFlags - -#define wxSF wxSizerFlags() - -// -------------------------------------------------------------------------------------- -// pxAlignment / pxStretchType -// -------------------------------------------------------------------------------------- -// These are full blown class types instead of enumerations because wxSizerFlags has an -// implicit conversion from integer (silly design flaw creating more work for me!) -// -struct pxAlignmentType -{ - enum - { - Centre, - Center = Centre, - Middle, - Left, - Right, - Top, - Bottom - }; - - int intval; - - wxSizerFlags Apply(wxSizerFlags flags = wxSizerFlags()) const; - - wxSizerFlags operator&(const wxSizerFlags& _flgs) const - { - return Apply(_flgs); - } - - wxSizerFlags Expand() const - { - return Apply().Expand(); - } - - wxSizerFlags Border(int dir, int padding) const - { - return Apply().Border(dir, padding); - } - - wxSizerFlags Proportion() const - { - return Apply().Proportion(intval); - } - - operator wxSizerFlags() const - { - return Apply(); - } -}; - -struct pxStretchType -{ - enum - { - Shrink, - Expand, - Shaped, - ReserveHidden, - FixedMinimum - }; - - int intval; - - wxSizerFlags Apply(wxSizerFlags flags = wxSizerFlags()) const; - - wxSizerFlags operator&(const wxSizerFlags& _flgs) const - { - return Apply(_flgs); - } - - wxSizerFlags Border(int dir, int padding) const - { - return Apply().Border(dir, padding); - } - - wxSizerFlags Proportion() const - { - return Apply().Proportion(intval); - } - - operator wxSizerFlags() const - { - return Apply(); - } -}; - -static __fi wxSizerFlags pxProportion(int prop) -{ - return wxSizerFlags(prop); -} - -static __fi wxSizerFlags pxBorder(int dir = wxALL, int pad = pxSizerFlags::StdPadding) -{ - return wxSizerFlags().Border(dir, pad); -} - -class pxStretchSpacer -{ -public: - int proportion; - - pxStretchSpacer(int prop = 0) - { - proportion = prop; - } -}; - -extern const pxAlignmentType - pxCentre, // Horizontal centered alignment - pxCenter, - pxMiddle, // vertical centered alignment - - pxAlignLeft, - pxAlignRight, - pxAlignTop, - pxAlignBottom; - -extern const pxStretchType - pxShrink, - pxExpand, - pxShaped, - pxReserveHidden, - pxFixedMinimum; - -// -------------------------------------------------------------------------------------- -// pxWindowAndFlags -// -------------------------------------------------------------------------------------- -// This struct is a go-between for combining windows and sizer flags in "neat" fashion. -// To create the struct, use the | operator, like so: -// -// myPanel | wxSizerFlags().Expand() -// -// Implementation Note: This struct is a template as it allows us to use a special -// version of the += operator that retains the type information of the window, in case -// the window implements its own += overloads (one example is pxStaticText). Without the -// template, the type of the window would only be known as "wxWindow" when it's added to the -// sizer, and would thus fail to invoke the correct operator overload. -// -template -struct pxWindowAndFlags -{ - WinType* window; - wxSizerFlags flags; -}; - - -extern wxSizerFlags operator&(const wxSizerFlags& _flgs, const wxSizerFlags& _flgs2); - -template ::value>::type> -pxWindowAndFlags operator|(WinType* _win, const wxSizerFlags& _flgs) -{ - pxWindowAndFlags result = {_win, _flgs}; - return result; -} - -template ::value>::type> -pxWindowAndFlags operator|(WinType& _win, const wxSizerFlags& _flgs) -{ - pxWindowAndFlags result = {&_win, _flgs}; - return result; -} - -// -------------------------------------------------------------------------------------- -// wxSizer Operator += .. a wxSizer.Add() Substitute -// -------------------------------------------------------------------------------------- -// This set of operators is the *recommended* method for adding windows to sizers, not just -// because it's a lot prettier but also because it allows controls like pxStaticText to over- -// ride default sizerflags behavior. -// -// += operator works on either sizers, wxDialogs or wxPanels. In the latter case, the window -// is added to the dialog/panel's toplevel sizer (wxPanel.GetSizer() is used). If the panel -// has no sizer set via SetSizer(), an assertion is generated. -// - -extern void operator+=(wxSizer& target, wxWindow* src); -extern void operator+=(wxSizer& target, wxSizer* src); -extern void operator+=(wxSizer& target, wxWindow& src); -extern void operator+=(wxSizer& target, wxSizer& src); - -extern void operator+=(wxSizer* target, wxWindow& src); -extern void operator+=(wxSizer* target, wxSizer& src); - -extern void operator+=(wxSizer& target, int spacer); -extern void operator+=(wxWindow& target, int spacer); -extern void operator+=(wxSizer& target, const pxStretchSpacer& spacer); -extern void operator+=(wxWindow& target, const pxStretchSpacer& spacer); - -// ---------------------------------------------------------------------------- -// Important: This template is needed in order to retain window type information and -// invoke the proper overloaded version of += (which is used by pxStaticText and other -// classes to perform special actions when added to sizers). -template -void operator+=(wxWindow& target, WinType* src) -{ - if (!pxAssert(target.GetSizer() != NULL)) - return; - *target.GetSizer() += src; -} - -template -void operator+=(wxWindow& target, WinType& src) -{ - if (!pxAssert(target.GetSizer() != NULL)) - return; - *target.GetSizer() += src; -} - -template -void operator+=(wxWindow& target, const pxWindowAndFlags& src) -{ - if (!pxAssert(target.GetSizer() != NULL)) - return; - *target.GetSizer() += src; -} - -template -void operator+=(wxSizer& target, const pxWindowAndFlags& src) -{ - target.Add(src.window, src.flags); -} - -wxDECLARE_EVENT(pxEvt_OnDialogCreated, wxCommandEvent); - -// -------------------------------------------------------------------------------------- -// pxDialogCreationFlags -// -------------------------------------------------------------------------------------- -class pxDialogCreationFlags -{ -public: - wxSize MinimumSize; - wxOrientation BoxSizerOrient; - - bool isResizable; - bool hasContextHelp; - bool hasCaption; - bool hasMinimizeBox; - bool hasMaximizeBox; - bool hasSystemMenu; - bool hasCloseBox; - -public: - virtual ~pxDialogCreationFlags() = default; - - pxDialogCreationFlags() - { - MinimumSize = wxDefaultSize; - BoxSizerOrient = wxVERTICAL; - isResizable = false; - hasContextHelp = false; - - hasCloseBox = true; - hasSystemMenu = true; - hasMinimizeBox = false; - hasMaximizeBox = false; - hasCaption = true; - } - - pxDialogCreationFlags& SetSizerOrient(wxOrientation orient) - { - BoxSizerOrient = orient; - return *this; - } - - pxDialogCreationFlags& SetResize(bool enable = true) - { - isResizable = enable; - return *this; - } - - pxDialogCreationFlags& SetMinimize(bool enable = true) - { - hasMinimizeBox = enable; - return *this; - } - - pxDialogCreationFlags& SetMaximize(bool enable = true) - { - hasMaximizeBox = enable; - return *this; - } - - // NOTE: Enabling system menu on dialogs usually doesn't work, and might cause - // other unwanted behavior, such as a missing close button. - pxDialogCreationFlags& SetSystemMenu(bool enable = true) - { - hasSystemMenu = enable; - return *this; - } - - pxDialogCreationFlags& SetCaption(bool enable = true) - { - hasCaption = enable; - return *this; - } - - pxDialogCreationFlags& SetCloseBox(bool enable = true) - { - hasCloseBox = enable; - return *this; - } - - pxDialogCreationFlags SetContextHelp(bool enabled = true) - { - hasContextHelp = enabled; - return *this; - } - - pxDialogCreationFlags& SetMinWidth(int width) - { - if (width > MinimumSize.x) - MinimumSize.SetWidth(width); - return *this; - } - - pxDialogCreationFlags& SetMinHeight(int height) - { - if (height > MinimumSize.y) - MinimumSize.SetHeight(height); - return *this; - } - - pxDialogCreationFlags& SetMinSize(const wxSize& size) - { - return SetMinWidth(size.x).SetMinHeight(size.y); - } - - - pxDialogCreationFlags Horizontal() const - { - return pxDialogCreationFlags(*this).SetSizerOrient(wxHORIZONTAL); - } - - pxDialogCreationFlags Vertical() const - { - return pxDialogCreationFlags(*this).SetSizerOrient(wxVERTICAL); - } - - pxDialogCreationFlags NoSizer() const - { - return pxDialogCreationFlags(*this).SetSizerOrient((wxOrientation)0); - } - - pxDialogCreationFlags Resize(bool enable = true) const - { - return pxDialogCreationFlags(*this).SetResize(enable); - } - - pxDialogCreationFlags Minimize(bool enable = true) const - { - return pxDialogCreationFlags(*this).SetMinimize(enable); - } - - pxDialogCreationFlags Maximize(bool enable = true) const - { - return pxDialogCreationFlags(*this).SetMaximize(enable); - } - - // NOTE: Enabling system menu on dialogs usually doesn't work, and might cause - // other unwanted behavior, such as a missing close button. - pxDialogCreationFlags SystemMenu(bool enable = true) const - { - return pxDialogCreationFlags(*this).SetSystemMenu(false); - } - - pxDialogCreationFlags Caption(bool enable = true) const - { - return pxDialogCreationFlags(*this).SetCaption(enable); - } - - pxDialogCreationFlags CloseBox(bool enable = true) const - { - return pxDialogCreationFlags(*this).SetCloseBox(enable); - } - - pxDialogCreationFlags NoResize() const - { - return pxDialogCreationFlags(*this).SetResize(false); - } - - pxDialogCreationFlags NoMinimize() const - { - return pxDialogCreationFlags(*this).SetMinimize(false); - } - - pxDialogCreationFlags NoMaximize() const - { - return pxDialogCreationFlags(*this).SetMaximize(false); - } - - pxDialogCreationFlags NoSystemMenu() const - { - return pxDialogCreationFlags(*this).SetSystemMenu(false); - } - - pxDialogCreationFlags NoCaption() const - { - return pxDialogCreationFlags(*this).SetCaption(false); - } - - pxDialogCreationFlags NoCloseBox() const - { - return pxDialogCreationFlags(*this).SetCloseBox(false); - } - - pxDialogCreationFlags MinWidth(int width) const - { - return pxDialogCreationFlags(*this).SetMinWidth(width); - } - - pxDialogCreationFlags MinHeight(int height) const - { - return pxDialogCreationFlags(*this).SetMinHeight(height); - } - - pxDialogCreationFlags MinSize(const wxSize& size) const - { - return pxDialogCreationFlags(*this).SetMinSize(size); - } - - pxDialogCreationFlags MinSize(int width, int height) const - { - return pxDialogCreationFlags(*this).SetMinWidth(width).SetMinHeight(height); - } - - int GetWxWindowFlags() const - { - int retval = 0; - if (isResizable) - retval |= wxRESIZE_BORDER; - if (hasCaption) - retval |= wxCAPTION; - if (hasMaximizeBox) - retval |= wxMAXIMIZE_BOX; - if (hasMinimizeBox) - retval |= wxMINIMIZE_BOX; - if (hasSystemMenu) - retval |= wxSYSTEM_MENU; - if (hasCloseBox) - retval |= wxCLOSE_BOX; - - return retval; - } -}; - -// -------------------------------------------------------------------------------------- -// wxDialogWithHelpers -// -------------------------------------------------------------------------------------- -class wxDialogWithHelpers : public wxDialog -{ - typedef wxDialog _parent; - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDialogWithHelpers); - -protected: - bool m_hasContextHelp; - wxBoxSizer* m_extraButtonSizer; - wxRect m_CreatedRect; - -public: - wxDialogWithHelpers(); - wxDialogWithHelpers(wxWindow* parent, const wxString& title, const pxDialogCreationFlags& cflags = pxDialogCreationFlags()); - virtual ~wxDialogWithHelpers() = default; - - void Init(const pxDialogCreationFlags& cflags); - void AddOkCancel(wxSizer& sizer, bool hasApply = false); - void AddOkCancel(wxSizer* sizer = NULL, bool hasApply = false); - void RememberPosition(); - - virtual void SmartCenterFit(); - virtual int ShowModal(); - virtual bool Show(bool show = true); - - // Must return the same thing as GetNameStatic; a name ideal for use in uniquely - // identifying dialogs. (this version is the 'instance' version, which is called - // by BaseConfigurationDialog to assign the wxWidgets dialog name, and for saving - // screenshots to disk) - virtual wxString GetDialogName() const; - - virtual wxStaticText& Label(const wxString& label); - virtual pxStaticText& Text(const wxString& label); - virtual pxStaticText& Heading(const wxString& label); - - wxDialogWithHelpers& SetMinWidth(int newWidth); - wxDialogWithHelpers& SetMinHeight(int newHeight); - - int GetCharHeight() const; - -protected: - void OnDialogCreated(wxCommandEvent& evt); - void OnOkCancel(wxCommandEvent& evt); - - bool ShouldPreventAppExit() const { return false; } - - void DoAutoCenter(); -}; - -// -------------------------------------------------------------------------------------- -// wxPanelWithHelpers -// -------------------------------------------------------------------------------------- -// Overview of Helpers provided by this class: -// * Simpler constructors that have wxID, position, and size parameters removed (We never -// use them in pcsx2) -// -// * Automatic 'primary box sizer' creation, assigned via SetSizer() -- use GetSizer() -// to retrieve it, or use the "*this += window;" syntax to add windows directly to it. -// -// * Built-in support for StaticBoxes (aka groupboxes). Create one at construction with -// a wxString label, or add one "after the fact" using AddFrame. -// -// * Propagates IdealWidth settings from parenting wxPanelWithHelpers classes, and auto- -// matically adjusts the width based on the sizer type (groupsizers get truncated to -// account for borders). -// -class wxPanelWithHelpers : public wxPanel -{ - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanelWithHelpers); - -public: - wxPanelWithHelpers(wxWindow* parent, wxOrientation orient, const wxString& staticBoxLabel); - wxPanelWithHelpers(wxWindow* parent, wxOrientation orient); - wxPanelWithHelpers(wxWindow* parent, const wxPoint& pos, const wxSize& size = wxDefaultSize); - explicit wxPanelWithHelpers(wxWindow* parent = NULL); - - wxPanelWithHelpers* AddFrame(const wxString& label, wxOrientation orient = wxVERTICAL); - - wxStaticText& Label(const wxString& label); - pxStaticText& Text(const wxString& label); - pxStaticText& Heading(const wxString& label); - - virtual wxPanelWithHelpers& SetMinWidth(int newWidth); - -protected: - void Init(); -}; - - -// -------------------------------------------------------------------------------------- -// pxTextWrapperBase -// -------------------------------------------------------------------------------------- -// this class is used to wrap the text on word boundary: wrapping is done by calling -// OnStartLine() and OnOutputLine() functions. This class by itself can be used as a -// line counting tool, but produces no formatted text output. -// -// [class "borrowed" from wxWidgets private code, made public, and renamed to avoid possible -// conflicts with future editions of wxWidgets which might make it public. Why this isn't -// publicly available already in wxBase I'll never know-- air] -// -class pxTextWrapperBase -{ -protected: - bool m_eol; - int m_linecount; - wxString m_indent; - -public: - virtual ~pxTextWrapperBase() = default; - - pxTextWrapperBase(const wxString& indent = wxEmptyString) - : m_indent(indent) - { - m_eol = false; - m_linecount = 0; - } - - // win is used for getting the font, text is the text to wrap, width is the - // max line width or -1 to disable wrapping - pxTextWrapperBase& Wrap(const wxWindow& win, const wxString& text, int widthMax); - - int GetLineCount() const - { - return m_linecount; - } - -protected: - // line may be empty - virtual void OnOutputLine(const wxString& line) {} - - // called at the start of every new line (except the very first one) - virtual void OnNewLine() {} - - void DoOutputLine(const wxString& line); - bool IsStartOfNewLine(); -}; - -// -------------------------------------------------------------------------------------- -// pxTextWrapper -// -------------------------------------------------------------------------------------- -// This class extends pxTextWrapperBase and adds the ability to retrieve the formatted -// result of word wrapping. -// -class pxTextWrapper : public pxTextWrapperBase -{ - typedef pxTextWrapperBase _parent; - -protected: - wxString m_text; - -public: - pxTextWrapper(const wxString& wrapPrefix = wxEmptyString) - : pxTextWrapperBase(wrapPrefix) - { - } - - virtual ~pxTextWrapper() = default; - - const wxString& GetResult() const - { - return m_text; - } - - pxTextWrapper& Wrap(const wxWindow& win, const wxString& text, int widthMax); - pxTextWrapper& Wrap(const wxWindow* win, const wxString& text, int widthMax); - -protected: - void OnOutputLine(const wxString& line); - void OnNewLine(); -}; - -// -------------------------------------------------------------------------------------- -// pxWindowTextWriter -// -------------------------------------------------------------------------------------- -class pxWindowTextWriter -{ -protected: - wxDC& m_dc; - - wxAlignment m_align; - wxPoint m_curpos; - int m_leading; - - virtual void _DoWriteLn(const wxString& msg); - void _DoWrite(const wxChar* msg); - -public: - pxWindowTextWriter(wxDC& dc); - virtual ~pxWindowTextWriter() = default; - - virtual void OnFontChanged(); - - pxWindowTextWriter& WriteLn(); - pxWindowTextWriter& WriteLn(const wxChar* fmt); - pxWindowTextWriter& SetFont(const wxFont& font); - pxWindowTextWriter& Align(const wxAlignment& align); - pxWindowTextWriter& WriteLn(const wxString fmt); - - pxWindowTextWriter& SetLeading(int lead) - { - m_leading = lead; - return *this; - } - - pxWindowTextWriter& SetWeight(wxFontWeight weight); - pxWindowTextWriter& SetStyle(wxFontStyle style); - pxWindowTextWriter& Normal(); - - pxWindowTextWriter& Bold() - { - return SetWeight(wxFONTWEIGHT_BOLD); - } - - pxWindowTextWriter& Italic() - { - return SetStyle(wxFONTSTYLE_ITALIC); - } - - pxWindowTextWriter& SetPos(const wxPoint& pos); - pxWindowTextWriter& MovePos(const wxSize& delta); - - pxWindowTextWriter& SetPos(int xpos, int ypos) - { - return SetPos(wxPoint(xpos, ypos)); - } - - pxWindowTextWriter& MovePos(int xdelta, int ydelta) - { - return MovePos(wxSize(xdelta, ydelta)); - } - - pxWindowTextWriter& SetY(int ypos); -}; - -// -------------------------------------------------------------------------------------- -// MoreStockCursors -// -------------------------------------------------------------------------------------- -// Because (inexplicably) the ArrowWait cursor isn't in wxWidgets stock list. -// -class MoreStockCursors -{ -protected: - std::unique_ptr m_arrowWait; - -public: - MoreStockCursors() {} - virtual ~MoreStockCursors() = default; - const wxCursor& GetArrowWait(); -}; - -enum BusyCursorType -{ - Cursor_NotBusy, - Cursor_KindaBusy, - Cursor_ReallyBusy, -}; - -extern MoreStockCursors StockCursors; - -// -------------------------------------------------------------------------------------- -// ScopedBusyCursor -// -------------------------------------------------------------------------------------- -// ... because wxWidgets wxBusyCursor doesn't really do proper nesting (doesn't let me -// override a partially-busy cursor with a really busy one) - -class ScopedBusyCursor -{ -protected: - static std::stack m_cursorStack; - static BusyCursorType m_defBusyType; - -public: - ScopedBusyCursor(BusyCursorType busytype); - virtual ~ScopedBusyCursor(); - - static void SetDefault(BusyCursorType busytype); - static void SetManualBusyCursor(BusyCursorType busytype); -}; - -// -------------------------------------------------------------------------------------- -// wxDoNotLogInThisScope -// -------------------------------------------------------------------------------------- -// This class is used to disable wx's sometimes inappropriate amount of forced error logging -// during specific activities. For example, when using wxDynamicLibrary to detect the -// validity of DLLs, wx will log errors for missing symbols. (sigh) -// -// Usage: Basic auto-cleanup destructor class. Create an instance inside a scope, and -// logging will be re-enabled when scope is terminated. :) -// -class wxDoNotLogInThisScope -{ - DeclareNoncopyableObject(wxDoNotLogInThisScope); - -protected: - bool m_prev; - -public: - wxDoNotLogInThisScope() - { - m_prev = wxLog::EnableLogging(false); - } - - virtual ~wxDoNotLogInThisScope() - { - wxLog::EnableLogging(m_prev); - } -}; - -// -------------------------------------------------------------------------------------- -// pxFitToDigits -// -------------------------------------------------------------------------------------- -// Fits a given text or spinner control to the number of digits requested, since by default -// they're usually way over-sized. - -extern void pxFitToDigits(wxWindow* win, int digits); -extern void pxFitToDigits(wxSpinCtrl* win, int digits); -extern wxTextCtrl* CreateNumericalTextCtrl(wxWindow* parent, int digits, long flags = wxTE_RIGHT); - - -////////////////////////////////////////////////////////////////////////////////////////////// - -extern bool pxIsValidWindowPosition(const wxWindow& window, const wxPoint& windowPos); -extern wxRect wxGetDisplayArea(); -extern wxString pxGetAppName(); - -extern int pxGetCharHeight(const wxWindow* wind, int rows = 1); -extern int pxGetCharHeight(const wxWindow& wind, int rows = 1); - -extern void pxSetToolTip(wxWindow* wind, const wxString& src); -extern void pxSetToolTip(wxWindow& wind, const wxString& src); -extern wxFont pxGetFixedFont(int ptsize = 8, wxFontWeight weight = wxFONTWEIGHT_NORMAL, bool underline = false); - -extern pxDialogCreationFlags pxDialogFlags(); diff --git a/pcsx2/gui/wxHelpers.cpp b/pcsx2/gui/wxHelpers.cpp deleted file mode 100644 index dd103bd0f5..0000000000 --- a/pcsx2/gui/wxHelpers.cpp +++ /dev/null @@ -1,435 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include -#include -#include -#include "common/General.h" -#include "common/Threading.h" -#include "gui/IniInterface.h" -#include "gui/wxGuiTools.h" -#include "gui/pxStaticText.h" - -using namespace pxSizerFlags; - -pxDialogCreationFlags pxDialogFlags() -{ - return pxDialogCreationFlags().CloseBox().Caption().Vertical(); -} - - -// -------------------------------------------------------------------------------------- - - -// Creates a text control which is right-justified and has it's minimum width configured to suit -// the number of digits requested. -wxTextCtrl* CreateNumericalTextCtrl(wxWindow* parent, int digits, long flags) -{ - wxTextCtrl* ctrl = new wxTextCtrl(parent, wxID_ANY); - ctrl->SetWindowStyleFlag(flags); - pxFitToDigits(ctrl, digits); - return ctrl; -} - -void pxFitToDigits(wxWindow* win, int digits) -{ - int ex; - win->GetTextExtent(wxString(L'0', digits + 1), &ex, NULL); - win->SetMinSize(wxSize(ex + 10, wxDefaultCoord)); // +10 for text control borders/insets and junk. -} - -void pxFitToDigits(wxSpinCtrl* win, int digits) -{ - // HACK!! The better way would be to create a pxSpinCtrl class that extends wxSpinCtrl and thus - // have access to wxSpinButton::DoGetBestSize(). But since I don't want to do that, we'll just - // make/fake it with a value it's pretty common to Win32/GTK/Mac: - - static const int MagicSpinnerSize = 18; - - int ex; - win->GetTextExtent(wxString(L'0', digits + 1), &ex, NULL); - win->SetMinSize(wxSize(ex + 10 + MagicSpinnerSize, wxDefaultCoord)); // +10 for text control borders/insets and junk. -} - -// ===================================================================================================== -// wxDialogWithHelpers Class Implementations -// ===================================================================================================== - -wxDEFINE_EVENT(pxEvt_OnDialogCreated, wxCommandEvent); - -wxIMPLEMENT_DYNAMIC_CLASS(wxDialogWithHelpers, wxDialog); - -wxDialogWithHelpers::wxDialogWithHelpers() -{ - m_hasContextHelp = false; - m_extraButtonSizer = NULL; - - Init(pxDialogFlags()); -} - -wxDialogWithHelpers::wxDialogWithHelpers(wxWindow* parent, const wxString& title, const pxDialogCreationFlags& cflags) - : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, cflags.GetWxWindowFlags()) -{ - m_hasContextHelp = cflags.hasContextHelp; - if ((int)cflags.BoxSizerOrient != 0) - { - SetSizer(new wxBoxSizer(cflags.BoxSizerOrient)); - *this += StdPadding; - } - - Init(cflags); - SetMinSize(cflags.MinimumSize); -} - -void wxDialogWithHelpers::Init(const pxDialogCreationFlags& cflags) -{ -// Note to self: if any comments indicate platform specific behaviour then -// ifdef them out to see if they fix the issue. I wasted too much time -// figuring out why the close box wouldn't work on wxGTK modal dialogs that -// had a minimise button. -#if _WIN32 - // This fixes it so that the dialogs show up in the task bar in Vista: - // (otherwise they go stupid iconized mode if the user minimizes them) - if (cflags.hasMinimizeBox) - SetExtraStyle(GetExtraStyle() & ~wxTOPLEVEL_EX_DIALOG); -#endif - - m_extraButtonSizer = NULL; - - if (m_hasContextHelp) - delete wxHelpProvider::Set(new wxSimpleHelpProvider()); - - Bind(pxEvt_OnDialogCreated, &wxDialogWithHelpers::OnDialogCreated, this); - - Bind(wxEVT_BUTTON, &wxDialogWithHelpers::OnOkCancel, this, wxID_OK); - Bind(wxEVT_BUTTON, &wxDialogWithHelpers::OnOkCancel, this, wxID_CANCEL); - - wxCommandEvent createEvent(pxEvt_OnDialogCreated); - createEvent.SetId(GetId()); - AddPendingEvent(createEvent); -} - -void wxDialogWithHelpers::OnDialogCreated(wxCommandEvent& evt) -{ - evt.Skip(); - if ((evt.GetId() == GetId()) && !GetDialogName().IsEmpty()) - SetName(L"Dialog:" + GetDialogName()); -} - -wxString wxDialogWithHelpers::GetDialogName() const -{ - return wxEmptyString; -} - -void wxDialogWithHelpers::DoAutoCenter() -{ - // Smart positioning logic! If our parent window is larger than our window by some - // good amount, then we center on that. If not, center relative to the screen. This - // avoids the popup automatically eclipsing the parent window (which happens in PCSX2 - // a lot since the main window is small). - - bool centerfail = true; - if (wxWindow* parent = GetParent()) - { - const wxSize parentSize(parent->GetSize()); - - if ((parentSize.x > ((int)GetSize().x * 1.5)) || (parentSize.y > ((int)GetSize().y * 1.5))) - { - CenterOnParent(); - centerfail = false; - } - } - - if (centerfail) - CenterOnScreen(); -} - -void wxDialogWithHelpers::SmartCenterFit() -{ - Fit(); - - const wxString dlgName(GetDialogName()); - if (dlgName.IsEmpty()) - { - DoAutoCenter(); - return; - } - - if (wxConfigBase* cfg = wxConfigBase::Get(false)) - { - wxRect screenRect(GetScreenRect()); - - IniLoader loader(cfg); - ScopedIniGroup group(loader, L"DialogPositions"); - cfg->SetRecordDefaults(false); - - if (GetWindowStyle() & wxRESIZE_BORDER) - { - wxSize size; - loader.Entry(dlgName + L"_Size", size, screenRect.GetSize()); - SetSize(size); - } - - if (!cfg->Exists(dlgName + L"_Pos")) - DoAutoCenter(); - else - { - wxPoint pos; - loader.Entry(dlgName + L"_Pos", pos, screenRect.GetPosition()); - SetPosition(pos); - } - cfg->SetRecordDefaults(true); - } -} - -// Overrides wxDialog behavior to include automatic Fit() and CenterOnParent/Screen. The centering -// is based on a heuristic the centers against the parent window if the parent window is at least -// 75% larger than the fitted dialog. -int wxDialogWithHelpers::ShowModal() -{ - SmartCenterFit(); - m_CreatedRect = GetScreenRect(); - return wxDialog::ShowModal(); -} - -// Overrides wxDialog behavior to include automatic Fit() and CenterOnParent/Screen. The centering -// is based on a heuristic the centers against the parent window if the parent window is at least -// 75% larger than the fitted dialog. -bool wxDialogWithHelpers::Show(bool show) -{ - if (show) - { - SmartCenterFit(); - m_CreatedRect = GetScreenRect(); - } - return wxDialog::Show(show); -} - -wxStaticText& wxDialogWithHelpers::Label(const wxString& label) -{ - return *new wxStaticText(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_VERTICAL); -} - -pxStaticText& wxDialogWithHelpers::Text(const wxString& label) -{ - return *new pxStaticText(this, label); -} - -pxStaticText& wxDialogWithHelpers::Heading(const wxString& label) -{ - return *new pxStaticHeading(this, label); -} - -void wxDialogWithHelpers::RememberPosition() -{ - // Save the dialog position if the dialog is named... - // FIXME : This doesn't get called if the app is exited by alt-f4'ing the main app window. - // ... not sure how to fix that yet. I could register a list of open windows into wxAppWithHelpers - // that systematically get closed. Seems like work, maybe later. --air - - if (wxConfigBase* cfg = IsIconized() ? NULL : wxConfigBase::Get(false)) - { - const wxString dlgName(GetDialogName()); - const wxRect screenRect(GetScreenRect()); - if (!dlgName.IsEmpty() && (m_CreatedRect != screenRect)) - { - wxPoint pos(screenRect.GetPosition()); - IniSaver saver(cfg); - ScopedIniGroup group(saver, L"DialogPositions"); - - if (GetWindowStyle() & wxRESIZE_BORDER) - { - wxSize size(screenRect.GetSize()); - saver.Entry(dlgName + L"_Size", size, screenRect.GetSize()); - } - saver.Entry(dlgName + L"_Pos", pos, screenRect.GetPosition()); - } - } -} - -void wxDialogWithHelpers::OnOkCancel(wxCommandEvent& evt) -{ - RememberPosition(); - - // Modal dialogs should be destroyed after ShowModal returns, otherwise there - // might be double delete problems if the dialog was declared on the stack. - if (!IsModal()) - Destroy(); - else - evt.Skip(); -} - -void wxDialogWithHelpers::AddOkCancel(wxSizer& sizer, bool hasApply) -{ - wxStdDialogButtonSizer& s_buttons(*new wxStdDialogButtonSizer()); - - s_buttons.AddButton(new wxButton(this, wxID_OK)); - s_buttons.AddButton(new wxButton(this, wxID_CANCEL)); - - if (hasApply) - s_buttons.AddButton(new wxButton(this, wxID_APPLY)); - - m_extraButtonSizer = new wxBoxSizer(wxHORIZONTAL); - - // Add the context-sensitive help button on the caption for the platforms - // which support it (currently MSW only) - if (m_hasContextHelp) - { - SetExtraStyle(wxDIALOG_EX_CONTEXTHELP); -#ifndef __WXMSW__ - *m_extraButtonSizer += new wxContextHelpButton(this) | StdButton(); -#endif - } - - // create a sizer to hold the help and ok/cancel buttons, for platforms - // that need a custom help icon. [fixme: help icon prolly better off somewhere else] - wxFlexGridSizer& flex(*new wxFlexGridSizer(2)); - flex.AddGrowableCol(0, 1); - flex.AddGrowableCol(1, 15); - - flex += m_extraButtonSizer | pxAlignLeft; - flex += s_buttons | (pxExpand & pxCenter); - - sizer += flex | StdExpand(); - - s_buttons.Realize(); -} - -void wxDialogWithHelpers::AddOkCancel(wxSizer* sizer, bool hasApply) -{ - if (sizer == NULL) - sizer = GetSizer(); - pxAssert(sizer); - AddOkCancel(*sizer, hasApply); -} - -wxDialogWithHelpers& wxDialogWithHelpers::SetMinWidth(int newWidth) -{ - SetMinSize(wxSize(newWidth, GetMinHeight())); - if (wxSizer* sizer = GetSizer()) - sizer->SetMinSize(wxSize(newWidth, sizer->GetMinSize().GetHeight())); - return *this; -} - -wxDialogWithHelpers& wxDialogWithHelpers::SetMinHeight(int newHeight) -{ - SetMinSize(wxSize(GetMinWidth(), newHeight)); - if (wxSizer* sizer = GetSizer()) - sizer->SetMinSize(wxSize(sizer->GetMinSize().GetWidth(), newHeight)); - return *this; -} - -int wxDialogWithHelpers::GetCharHeight() const -{ - return pxGetCharHeight(this, 1); -} - -// -------------------------------------------------------------------------------------- -// wxPanelWithHelpers Implementations -// -------------------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxPanelWithHelpers, wxPanel); - -void wxPanelWithHelpers::Init() -{ -} - -// Creates a Static Box container for this panel. the static box sizer becomes the default -// sizer for this panel. If the panel already has a sizer set, then that sizer will be -// transfered to the new StaticBoxSizer (and will be the first item in it's list, retaining -// consistent and expected layout) -wxPanelWithHelpers* wxPanelWithHelpers::AddFrame(const wxString& label, wxOrientation orient) -{ - wxSizer* oldSizer = GetSizer(); - - SetSizer(new wxStaticBoxSizer(orient, this, label), false); - Init(); - - if (oldSizer) - *this += oldSizer | pxExpand; - - return this; -} - -wxStaticText& wxPanelWithHelpers::Label(const wxString& label) -{ - return *new wxStaticText(this, wxID_ANY, label); -} - -pxStaticText& wxPanelWithHelpers::Text(const wxString& label) -{ - return *new pxStaticText(this, label); -} - -pxStaticText& wxPanelWithHelpers::Heading(const wxString& label) -{ - return *new pxStaticHeading(this, label); -} - -wxPanelWithHelpers::wxPanelWithHelpers(wxWindow* parent, wxOrientation orient, const wxString& staticBoxLabel) - : wxPanel(parent) -{ - SetSizer(new wxStaticBoxSizer(orient, this, staticBoxLabel)); - Init(); -} - -wxPanelWithHelpers::wxPanelWithHelpers(wxWindow* parent, wxOrientation orient) - : wxPanel(parent) -{ - SetSizer(new wxBoxSizer(orient)); - Init(); -} - -wxPanelWithHelpers::wxPanelWithHelpers(wxWindow* parent) - : wxPanel(parent) -{ - Init(); -} - -wxPanelWithHelpers::wxPanelWithHelpers(wxWindow* parent, const wxPoint& pos, const wxSize& size) - : wxPanel(parent, wxID_ANY, pos, size) -{ - Init(); -} - -wxPanelWithHelpers& wxPanelWithHelpers::SetMinWidth(int newWidth) -{ - SetMinSize(wxSize(newWidth, GetMinHeight())); - if (wxSizer* sizer = GetSizer()) - sizer->SetMinSize(wxSize(newWidth, sizer->GetMinSize().GetHeight())); - return *this; -} - -int pxGetCharHeight(const wxWindow* wind, int rows) -{ - if (!wind) - return 0; - wxClientDC dc(wx_const_cast(wxWindow*, wind)); - dc.SetFont(wind->GetFont()); -#ifdef __linux__ - // It seems there is a bad detection of the size of the font (non standard dpi ???). Font are cut in top or bottom. - // Add a correction factor to leave enough room. Visualy 1.7 seems fine but feel free to tune it -- Gregory - return (dc.GetCharHeight() * 1.7 + 1) * rows; -#else - return (dc.GetCharHeight() + 1) * rows; -#endif -} - -int pxGetCharHeight(const wxWindow& wind, int rows) -{ - return pxGetCharHeight(&wind, rows); -} diff --git a/pcsx2/gui/wxSettingsInterface.cpp b/pcsx2/gui/wxSettingsInterface.cpp deleted file mode 100644 index 8505150b24..0000000000 --- a/pcsx2/gui/wxSettingsInterface.cpp +++ /dev/null @@ -1,192 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" - -#include "StringHelpers.h" -#include "wxSettingsInterface.h" -#include "common/Assertions.h" -#include "common/StringUtil.h" - -wxSettingsInterface::wxSettingsInterface(wxConfigBase* config) - : m_config(config) -{ - m_config->SetPath(wxEmptyString); -} - -wxSettingsInterface::~wxSettingsInterface() -{ - m_config->SetPath(wxEmptyString); -} - -void wxSettingsInterface::CheckPath(const char* section) const -{ - if (m_current_path.compare(section) == 0) - return; - - m_current_path = section; - m_config->SetPath(wxString::Format("/%s", section)); -} - -bool wxSettingsInterface::Save() -{ - pxFailRel("Not implemented"); - return false; -} - -void wxSettingsInterface::Clear() -{ - pxFailRel("Not implemented"); -} - -bool wxSettingsInterface::GetIntValue(const char* section, const char* key, int* value) const -{ - CheckPath(section); - return m_config->Read(key, value); -} - -bool wxSettingsInterface::GetUIntValue(const char* section, const char* key, uint* value) const -{ - CheckPath(section); - - long lvalue; - if (!m_config->Read(key, &lvalue)) - return false; - - *value = static_cast(lvalue); - return true; -} - -bool wxSettingsInterface::GetFloatValue(const char* section, const char* key, float* value) const -{ - CheckPath(section); - return m_config->Read(key, value); -} - -bool wxSettingsInterface::GetDoubleValue(const char* section, const char* key, double* value) const -{ - CheckPath(section); - return m_config->Read(key, value); -} - -bool wxSettingsInterface::GetBoolValue(const char* section, const char* key, bool* value) const -{ - CheckPath(section); - wxString wxKey(key); - if (!m_config->HasEntry(wxKey)) - return false; - - wxString ret = m_config->Read(wxKey); - *value = (ret == wxT("enabled") || ret == wxT("1")); - return true; -} - -bool wxSettingsInterface::GetStringValue(const char* section, const char* key, std::string* value) const -{ - CheckPath(section); - wxString wxKey(key); - if (!m_config->HasEntry(wxKey)) - return false; - - wxString ret = m_config->Read(wxKey); - *value = StringUtil::wxStringToUTF8String(ret); - return true; -} - -void wxSettingsInterface::SetIntValue(const char* section, const char* key, int value) -{ - CheckPath(section); - m_config->Write(key, value); -} - -void wxSettingsInterface::SetUIntValue(const char* section, const char* key, uint value) -{ - CheckPath(section); - m_config->Write(key, static_cast(value)); -} - -void wxSettingsInterface::SetFloatValue(const char* section, const char* key, float value) -{ - CheckPath(section); - m_config->Write(key, value); -} - -void wxSettingsInterface::SetDoubleValue(const char* section, const char* key, double value) -{ - CheckPath(section); - m_config->Write(key, value); -} - -void wxSettingsInterface::SetBoolValue(const char* section, const char* key, bool value) -{ - CheckPath(section); - m_config->Write(key, value ? wxT("enabled") : wxT("disabled")); -} - -void wxSettingsInterface::SetStringValue(const char* section, const char* key, const char* value) -{ - CheckPath(section); - m_config->Write(key, wxString::FromUTF8(value)); -} - -std::vector wxSettingsInterface::GetStringList(const char* section, const char* key) const -{ - pxFailRel("Not implemented"); - return {}; -} - -void wxSettingsInterface::SetStringList(const char* section, const char* key, const std::vector& items) -{ - pxFailRel("Not implemented"); -} - -bool wxSettingsInterface::RemoveFromStringList(const char* section, const char* key, const char* item) -{ - pxFailRel("Not implemented"); - return false; -} - -bool wxSettingsInterface::AddToStringList(const char* section, const char* key, const char* item) -{ - return false; -} - -std::vector> wxSettingsInterface::GetKeyValueList(const char* section) const -{ - pxFailRel("Not implemented"); - return {}; -} - -void wxSettingsInterface::SetKeyValueList(const char* section, const std::vector>& items) -{ - pxFailRel("Not implemented"); -} - -bool wxSettingsInterface::ContainsValue(const char* section, const char* key) const -{ - CheckPath(section); - return m_config->Exists(key); -} - -void wxSettingsInterface::DeleteValue(const char* section, const char* key) -{ - CheckPath(section); - m_config->DeleteEntry(key); -} - -void wxSettingsInterface::ClearSection(const char* section) -{ - pxFailRel("Not implemented"); -} diff --git a/pcsx2/gui/wxSettingsInterface.h b/pcsx2/gui/wxSettingsInterface.h deleted file mode 100644 index bfdbac14e1..0000000000 --- a/pcsx2/gui/wxSettingsInterface.h +++ /dev/null @@ -1,64 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2021 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include -#include - -#include "common/SettingsInterface.h" - -class wxSettingsInterface : public SettingsInterface -{ -public: - wxSettingsInterface(wxConfigBase* config); - ~wxSettingsInterface(); - - bool Save() override; - void Clear() override; - - bool GetIntValue(const char* section, const char* key, int* value) const override; - bool GetUIntValue(const char* section, const char* key, uint* value) const override; - bool GetFloatValue(const char* section, const char* key, float* value) const override; - bool GetDoubleValue(const char* section, const char* key, double* value) const override; - bool GetBoolValue(const char* section, const char* key, bool* value) const override; - bool GetStringValue(const char* section, const char* key, std::string* value) const override; - - void SetIntValue(const char* section, const char* key, int value) override; - void SetUIntValue(const char* section, const char* key, uint value) override; - void SetFloatValue(const char* section, const char* key, float value) override; - void SetDoubleValue(const char* section, const char* key, double value) override; - void SetBoolValue(const char* section, const char* key, bool value) override; - - void SetStringValue(const char* section, const char* key, const char* value) override; - - std::vector GetStringList(const char* section, const char* key) const override; - void SetStringList(const char* section, const char* key, const std::vector& items) override; - bool RemoveFromStringList(const char* section, const char* key, const char* item) override; - bool AddToStringList(const char* section, const char* key, const char* item) override; - - std::vector> GetKeyValueList(const char* section) const override; - void SetKeyValueList(const char* section, const std::vector>& items) override; - - bool ContainsValue(const char* section, const char* key) const override; - void DeleteValue(const char* section, const char* key) override; - void ClearSection(const char* section) override; - -private: - void CheckPath(const char* section) const; - - wxConfigBase* m_config; - mutable wxString m_current_path; -}; diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj deleted file mode 100644 index 58f21e84b3..0000000000 --- a/pcsx2/pcsx2.vcxproj +++ /dev/null @@ -1,1064 +0,0 @@ - - - - - - - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD} - - - - Application - Unicode - $(DefaultPlatformToolset) - true - true - false - - - - - - - - - - - - - - - - AllRules.ruleset - $(EXEString) - - - - $(SolutionDir)3rdparty\wxWidgets3.0\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\xbyak;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\xz\xz\src\liblzma\api;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\libpng;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\glad\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\cubeb\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\imgui\include;$(SolutionDir)3rdparty\imgui\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\libzip;$(SolutionDir)3rdparty\libzip\libzip\lib;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\d3d12memalloc\include;%(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\zstd\zstd\lib - %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include - %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\ffmpeg\include - Async - Use - PrecompiledHeader.h - PrecompiledHeader.h;%(ForcedIncludeFiles) - NoExtensions - /Zc:externConstexpr %(AdditionalOptions) - WIN32_LEAN_AND_MEAN;ZIP_STATIC;LZMA_API_STATIC;BUILD_DX=1;ENABLE_OPENGL;ENABLE_VULKAN;SPU2X_CUBEB;DIRECTINPUT_VERSION=0x0800;%(PreprocessorDefinitions) - PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions) - PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions) - NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions) - PCSX2_CI;%(PreprocessorDefinitions) - - __SSE4_1__;%(PreprocessorDefinitions) - NotSet - AdvancedVectorExtensions2 - false - $(IntDir)%(RelativeDir) - - - Precise - - - Yes - comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;%(AdditionalDependencies) - dxguid.lib;dinput8.lib;hid.lib;PowrProf.lib;d3dcompiler.lib;d3d11.lib;dxgi.lib;strmiids.lib;opengl32.lib;comsuppw.lib;OneCore.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - cmd.exe /c %(RelativeDir)bin2cpp.cmd %(Filename)%(Extension) - %(RelativeDir)%(Filename).h - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - true - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) - - - - - - - - - - {449ad25e-424a-4714-babc-68706cdcc33b} - - - {bc236261-77e8-4567-8d09-45cd02965eb6} - - - {d6973076-9317-4ef2-a0b8-b7a18ac0713e} - - - {0fae817d-9a32-4830-857e-81da57246e16} - false - - - {e9b51944-7e6d-4bcd-83f2-7bbd5a46182d} - - - {24c45343-fd20-5c92-81c1-35a2ae841e79} - - - {3fcc50c2-81e9-5db2-b8d8-2129427568b1} - - - {6744dad8-9c70-574a-bff2-9f8dddb24a75} - - - {12728250-16ec-4dc6-94d7-e21dd88947f8} - - - {a0d2b3ad-1f72-4ee3-8b5c-f2c358da35f0} - - - {2f6c0388-20cb-4242-9f6c-a6ebb6a83f47} - false - - - {677b7d11-d5e1-40b3-88b1-9a4df83d2213} - false - - - {ed2f21fd-0a36-4a8f-9b90-e7d92a2acb63} - - - {bf74c473-dc04-44b3-92e8-4145f4e77342} - - - {de9653b6-17dd-356a-9ee0-28a731772587} - - - {88fb34ec-845e-4f21-a552-f1573b9ed167} - - - {20b2e9fe-f020-42a0-b324-956f5b06ea68} - - - {4639972e-424e-4e13-8b07-ca403c481346} - - - {c0293b32-5acf-40f0-aa6c-e6da6f3bf33a} - - - - - - - - \ No newline at end of file diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters deleted file mode 100644 index 87d517f3f7..0000000000 --- a/pcsx2/pcsx2.vcxproj.filters +++ /dev/null @@ -1,2753 +0,0 @@ - - - - - {d1e5f218-107b-4e8c-9527-55cb9388b544} - - - {5dc872c1-db13-4c70-9d44-a3fc4b6fc241} - - - {3cda6808-a2bd-48a7-912e-161a7d0f5bce} - - - {a3f5cf44-2d2b-4822-b530-57286c85374a} - - - {a7187804-2892-4f90-9360-cf2bd6c31540} - - - {8cb5090c-c891-498b-bec2-183d4deca91f} - - - {1c7a3f63-9285-4202-84c5-278a854db932} - - - {33efddb9-1e44-44dc-b857-45b49b22c750} - - - {c1691a12-a08a-4ca7-ba66-b4ff4c7f30a5} - - - {57bf864f-d216-4d97-968d-4c0ff4f166ec} - - - {7865c84c-6431-4781-a016-45eeac5cad2c} - - - {c4ee1612-1ce9-4c74-8323-f98851014558} - - - {a210a307-e8bf-4bbc-8770-e720cc7fc953} - - - {e14056ea-b126-4e5b-94e0-3ce09463970b} - - - {4ba4f2e2-5195-471b-9a0d-d84fa3fb96aa} - - - {088d96f1-2b69-4c53-9f14-026db3368905} - - - {259f9912-d495-45da-b894-8312fde18364} - - - {5f98cd09-41cd-4c1e-ad7d-06a8859e770c} - - - {620afa6f-3aea-4093-bed0-46fd37a5ad6d} - - - {f9de9bc0-4bc5-4fb5-8a1f-04bc31a82b07} - - - {a6b34a13-67af-45fd-a2fb-2c86a762dd39} - - - {89c4908d-b0a1-4c69-9104-00e0af69a714} - - - {f5c8a322-8f48-44a8-97ad-4bd0017bdfe7} - - - {79aa85ae-b75b-421a-838c-8144d9dacd76} - - - {094486fe-8ffc-4b98-81d6-6c381554fd8e} - - - {409f8654-a1cd-4624-9ede-3ae83a707876} - - - {e373743e-ee9f-421c-aa28-2d02a08bb252} - - - {5a3ec813-4719-4ca1-9988-3587ea402a2b} - - - {a11bcdd7-008e-40aa-9376-d1cc2bf4e67c} - - - {8aa116a4-8bae-4ec0-a919-be8a320491eb} - - - {4dab2d06-69e0-4f3e-b6d3-45e5e85af940} - - - {67e51016-d1db-44d2-910d-349d2833f798} - - - {5602cc18-9d1c-49c8-9509-7e4cf9ecd91b} - - - {ffa6c572-1615-4dad-80c3-333e3eb476f2} - - - {bba4d866-e26f-49c8-83fb-fb970c33798b} - - - {96937113-fef0-4e63-92e5-a30edcc78dc2} - - - {5e741f2d-9e0b-4e43-b2a2-44a8370e1546} - - - {c5237754-2509-4291-b869-c5dacc1a8aba} - - - {99a8dd4e-22db-4818-8799-7646b363b725} - - - {03bc7561-2b23-469a-936d-0463fb0ee9d2} - - - {1f18feb4-85f0-455d-927a-d4d6b226d8a5} - - - {ebbed875-840b-4b7b-96e4-4da2d4e38d4b} - - - {510ab530-0308-44f7-a7e3-08e474065651} - - - {485e39c6-aa13-4094-8ec8-3113cd0a1734} - - - {f8e51d3e-dc60-4aa9-9d37-c7c1ccaacd02} - - - {7a0a1104-f9ee-4cd1-aaba-f8267eba1658} - - - {7b917318-5a5e-44c0-8463-1dfab67f3b67} - - - {be861049-a142-4650-85a5-a2fdd4eef011} - - - {a5904fb6-e846-4cbf-940c-ca1c604140a0} - - - {157740ae-b338-4d7f-81cb-cffa9d39a756} - - - {bed493d6-96dc-4057-a1f2-31f88ec927d9} - - - {85c5a0d2-6404-439f-8756-d908a1442b96} - - - {8d5454f9-590c-4c53-aae1-8391c6465e50} - - - {bc20f567-851d-4440-a3fd-ef470241962e} - - - {9e9b52d7-7b1c-44b2-82d8-1e0d8085e7e0} - - - {93da3d51-9457-4fde-b374-c2fbe4780f59} - - - {57c4be94-9a2c-469b-9b02-b3b324857fc5} - - - {12c15e0b-4647-4ce2-9bc4-89e6e9e8f531} - - - {a0723e13-c839-464d-8cfa-6c440ae03537} - - - {928400ad-4db4-44ca-9a6d-c65e489c8ea0} - - - {7c01f24d-2141-4054-b3f9-1d9c67ae7ad6} - - - {db2fc75d-6552-4991-9155-885abd8796e4} - - - {d426ae2b-9ad6-473d-adba-57b7bdac87db} - - - {229bf045-e378-4ec5-bdf8-43938762511e} - - - {64b05697-98cd-48ed-b5a5-cb0f6044ca15} - - - {18d51d37-34bc-489c-b84f-31362bbb9243} - - - {7e1e6046-08a0-456e-8e03-47bb3813d9b0} - - - {7b86e42b-816a-4d08-9de8-fa308d2b8d88} - - - {df9de75c-2272-4f73-b2a0-4f9f492ba1e9} - - - {e1cbcaf6-9f65-4f14-9e89-27dd0f10e047} - - - {38f3b97b-eac6-4085-b6b0-567ec5081242} - - - {f65f5552-af5b-47b0-9029-48d4dc33c2f9} - - - {85d4539e-fc10-4369-98f0-0ee9a6a9cc00} - - - {5be27550-9ed4-4c27-9e69-e5933613c4e8} - - - {8a0a142d-a4e0-4e8d-afbf-955fe1697eca} - - - {c140280a-87c6-4433-b877-f0bf8cca9345} - - - {81af12a1-9605-4dd8-a70e-fd4ae81fbdd5} - - - {eaa22029-6839-4c09-93e1-faea8d8c0d7c} - - - {78f5077b-255e-435e-9a51-352171dfaee8} - - - {65f21394-287a-471b-a0c1-d8f0d5d95a81} - - - {98829aa9-bb81-4564-bd6e-128719c4faa0} - - - {0ba8b3c9-0915-4228-a572-3526190efb00} - - - {7699b8f4-a217-4d8a-bf08-e28e58b3ae07} - - - {8c7c08ed-6c87-4b10-82ca-c832e84828c4} - - - {9cb1aa40-043d-47f7-86fd-837e10012e75} - - - {6e0dc702-cb44-4a22-a595-4cbd335f31a4} - - - {eb697f5b-85f5-424a-a7e4-8d8b73d3426e} - - - - - Misc - - - Docs - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - AppHost\Dialogs - - - System\Ps2\PAD - - - System\Ps2\GS\Shaders\OpenGL - - - System\Ps2\GS\Shaders\OpenGL - - - System\Ps2\GS\Shaders\OpenGL - - - System\Ps2\GS\Shaders\OpenGL - - - System\Ps2\GS\Shaders\OpenGL - - - System\Ps2\GS\Shaders\OpenGL - - - System\Ps2\GS\Shaders\OpenGL - - - System\Ps2\GS\Shaders\Common - - - System\Ps2\GS\Shaders\Vulkan - - - System\Ps2\GS\Shaders\Vulkan - - - System\Ps2\GS\Shaders\Vulkan - - - System\Ps2\GS\Shaders\Vulkan - - - System\Ps2\GS\Shaders\Direct3D - - - System\Ps2\GS\Shaders\Direct3D - - - System\Ps2\GS\Shaders\Direct3D - - - System\Ps2\GS\Shaders\Direct3D - - - System\Ps2\GS\Shaders\Direct3D - - - - - Misc - - - Misc - - - Misc - - - Misc - - - System - - - System - - - System - - - System - - - System - - - System - - - System - - - System\ISO - - - System\Ps2 - - - System\Ps2 - - - System\Ps2\EmotionEngine - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Memory - - - System\Ps2\EmotionEngine\Memory - - - System\Ps2\EmotionEngine\Memory - - - System\Ps2\EmotionEngine\Memory - - - System\Ps2\EmotionEngine\VU - - - System\Ps2\EmotionEngine\VU - - - System\Ps2\EmotionEngine\VU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\DMAC\Sif - - - System\Ps2\EmotionEngine\DMAC\Sif - - - System\Ps2\EmotionEngine\DMAC\Sif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec - - - System\Ps2\EmotionEngine\DMAC\SPR - - - System\Ps2\EmotionEngine\DMAC\Gif - - - System\Ps2\EmotionEngine\EE - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Dynarec\ix86-32 - - - System\Ps2\EmotionEngine\EE\Interpreter - - - System\Ps2\EmotionEngine\EE\Interpreter - - - System\Ps2\EmotionEngine\EE\Interpreter - - - System\Ps2\EmotionEngine\EE\Interpreter - - - System\Ps2\EmotionEngine\EE\Interpreter - - - System\Ps2\EmotionEngine\EE\Interpreter - - - System\Ps2\EmotionEngine\EE\Interpreter - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop\Dynarec - - - System\Ps2\Iop\Dynarec - - - System\Ps2\Iop\Hardware - - - System\Ps2\Iop\Hardware - - - System\Ps2\Iop\Hardware - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\IPU - - - System\Ps2\IPU - - - System\Ps2\IPU - - - System\Ps2\IPU - - - System\Ps2\IPU\mpeg2lib - - - System\Ps2\IPU\mpeg2lib - - - System\Ps2\GS\GIF - - - System\Ps2\GS\GIF - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\iCore - - - System\Ps2\iCore - - - System\IsoFS - - - System\IsoFS - - - System\IsoFS - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Win32 - - - AppHost\Win32 - - - AppHost\Linux - - - AppHost - - - AppHost - - - AppHost - - - Misc - - - Misc - - - System\Ps2\IPU - - - System\Ps2 - - - AppHost - - - AppHost\Dialogs - - - AppHost\Panels - - - System\Ps2\GS\GIF - - - System\Ps2\GS - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - AppHost\Debugger - - - AppHost\Debugger - - - System\Ps2\Debug - - - System\Ps2\Debug - - - AppHost\Debugger - - - AppHost\Debugger - - - AppHost\Debugger - - - AppHost\Debugger - - - System\Ps2\Debug - - - AppHost\Debugger - - - System\Ps2\EmotionEngine\DMAC\Sif - - - AppHost\Debugger - - - System\ISO - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - AppHost\Win32 - - - AppHost\Win32 - - - AppHost\Linux - - - System\Ps2\Iop - - - System\Ps2 - - - System\Ps2\Iop - - - System\Ps2\Iop - - - Recording - - - Recording - - - Recording - - - System\Ps2\IPU - - - Recording - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD\Windows - - - System\Ps2\Iop\CDVD\Windows - - - System\Ps2\Iop\CDVD\Linux - - - System\Ps2\Iop\CDVD\Linux - - - AppHost - - - System - - - System\Ps2\Iop\FW - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9\ATA\Commands - - - System\Ps2\DEV9\ATA\Commands - - - System\Ps2\DEV9\ATA\Commands - - - System\Ps2\DEV9\ATA\Commands - - - System\Ps2\DEV9\ATA\Commands - - - System\Ps2\DEV9\ATA\Commands - - - System\Ps2\DEV9\ATA\Commands - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9\InternalServers - - - System\Ps2\DEV9\InternalServers - - - System\Ps2\DEV9\InternalServers - - - System\Ps2\DEV9\PacketReader\ARP - - - System\Ps2\DEV9\PacketReader\IP\ICMP - - - System\Ps2\DEV9\PacketReader\IP\TCP - - - System\Ps2\DEV9\PacketReader\IP\TCP - - - System\Ps2\DEV9\PacketReader\IP\UDP\DHCP - - - System\Ps2\DEV9\PacketReader\IP\UDP\DHCP - - - System\Ps2\DEV9\PacketReader\IP\UDP\DNS - - - System\Ps2\DEV9\PacketReader\IP\UDP\DNS - - - System\Ps2\DEV9\PacketReader\IP\UDP - - - System\Ps2\DEV9\PacketReader\IP - - - System\Ps2\DEV9\PacketReader\IP - - - System\Ps2\DEV9\PacketReader - - - System\Ps2\DEV9\PacketReader - - - System\Ps2\DEV9 - - - System\Ps2\DEV9\Sessions - - - System\Ps2\DEV9\Sessions\ICMP_Session - - - System\Ps2\DEV9\Sessions\TCP_Session - - - System\Ps2\DEV9\Sessions\TCP_Session - - - System\Ps2\DEV9\Sessions\TCP_Session - - - System\Ps2\DEV9\Sessions\UDP_Session - - - System\Ps2\DEV9\Sessions\UDP_Session - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - AppHost\Dialogs - - - AppHost\Dialogs - - - System\ISO - - - Recording\Utilities - - - System\Ps2\GS\Renderers\Direct3D11 - - - System\Ps2\GS\Renderers\Direct3D11 - - - System\Ps2\GS\Renderers\Direct3D11 - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Null - - - System\Ps2\GS\Renderers\Null - - - System\Ps2\GS\Renderers\Null - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Window - - - System\Ps2\GS\Window - - - System\Ps2\GS\Window - - - System\Ps2\GS\Renderers\Direct3D11 - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - System\Ps2\Iop - - - System\Ps2\Iop - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - System - - - System\Ps2\SPU2 - - - Host - - - Host - - - Host - - - AppHost - - - Host - - - Host - - - Host - - - System\Ps2\GS\Renderers\Vulkan - - - System\Ps2\GS\Renderers\Vulkan - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\EmotionEngine\EE\Dynarec - - - AppHost - - - Host - - - System\Ps2\GS\Renderers\Direct3D12 - - - System\Ps2\GS\Renderers\Direct3D12 - - - AppHost - - - AppHost - - - Host - - - Host - - - Host - - - Host - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - Host - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\USB - - - - - Misc - - - Misc - - - Misc - - - System\ISO - - - System\ISO - - - System\Include - - - System\Include - - - System\Include - - - System\Include - - - System\Include - - - System\Include - - - System\Include - - - System\Include - - - System\Ps2\EmotionEngine - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Hardware - - - System\Ps2\EmotionEngine\Memory - - - System\Ps2\EmotionEngine\Memory - - - System\Ps2\EmotionEngine\Memory - - - System\Ps2\EmotionEngine\VU - - - System\Ps2\EmotionEngine\VU - - - System\Ps2\EmotionEngine\VU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\VU\Interpreter - - - System\Ps2\EmotionEngine\DMAC\Sif - - - System\Ps2\EmotionEngine\DMAC\Sif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif - - - System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec - - - System\Ps2\EmotionEngine\DMAC\SPR - - - System\Ps2\EmotionEngine\DMAC\Gif - - - System\Ps2\EmotionEngine\EE - - - System\Ps2\EmotionEngine\EE - - - System\Ps2\EmotionEngine\EE - - - System\Ps2\EmotionEngine\EE - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\EmotionEngine\EE\Dynarec - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\Iop\Dynarec - - - System\Ps2\Iop\Hardware - - - System\Ps2\Iop\Hardware - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\Iop\CDVD - - - System\Ps2\IPU - - - System\Ps2\IPU - - - System\Ps2\IPU - - - System\Ps2\IPU - - - System\Ps2\IPU\mpeg2lib - - - System\Ps2\IPU\mpeg2lib - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Include - - - System\Ps2\Include - - - System\Ps2\Include - - - System\Ps2\iCore - - - System\IsoFS - - - System\IsoFS - - - System\IsoFS - - - System\IsoFS - - - System\IsoFS - - - System\IsoFS - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Dialogs - - - AppHost\Resources - - - AppHost\Panels - - - AppHost\Panels - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - AppHost\Include - - - Misc - - - System\Ps2\IPU - - - AppHost - - - AppHost\Panels - - - System\Ps2\GS\GIF - - - System\Ps2\EmotionEngine\VU\Dynarec\microVU - - - System\ISO - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - AppHost\Debugger - - - AppHost\Debugger - - - System\Ps2\Debug - - - System\Ps2\Debug - - - AppHost\Debugger - - - AppHost\Debugger - - - AppHost\Debugger - - - AppHost\Debugger - - - System\Ps2\Debug - - - AppHost\Debugger - - - AppHost\Debugger - - - System\ISO - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\Ps2\Debug - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - System\ISO - - - System\Include - - - System\Ps2\Iop - - - System\Ps2 - - - System\Ps2\Iop - - - Recording - - - Recording - - - Recording - - - Recording - - - System\Ps2\Iop\CDVD - - - AppHost\Include - - - System\Include - - - System\Ps2\Iop\FW - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - System\Ps2\SPU2 - - - Recording\Utilities - - - System\Ps2\DEV9 - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9\ATA - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9\InternalServers - - - System\Ps2\DEV9\InternalServers - - - System\Ps2\DEV9\InternalServers - - - System\Ps2\DEV9 - - - System\Ps2\DEV9\PacketReader\ARP - - - System\Ps2\DEV9\PacketReader\IP\ICMP - - - System\Ps2\DEV9\PacketReader\IP\TCP - - - System\Ps2\DEV9\PacketReader\IP\TCP - - - System\Ps2\DEV9\PacketReader\IP\UDP\DHCP - - - System\Ps2\DEV9\PacketReader\IP\UDP\DHCP - - - System\Ps2\DEV9\PacketReader\IP\UDP\DNS - - - System\Ps2\DEV9\PacketReader\IP\UDP\DNS - - - System\Ps2\DEV9\PacketReader\IP\UDP\DNS - - - System\Ps2\DEV9\PacketReader\IP\UDP - - - System\Ps2\DEV9\PacketReader\IP - - - System\Ps2\DEV9\PacketReader\IP - - - System\Ps2\DEV9\PacketReader\IP - - - System\Ps2\DEV9\PacketReader\IP - - - System\Ps2\DEV9\PacketReader - - - System\Ps2\DEV9\PacketReader - - - System\Ps2\DEV9\PacketReader - - - System\Ps2\DEV9 - - - System\Ps2\DEV9\Sessions - - - System\Ps2\DEV9\Sessions\ICMP_Session - - - System\Ps2\DEV9\Sessions\TCP_Session - - - System\Ps2\DEV9\Sessions\UDP_Session - - - System\Ps2\DEV9\Sessions\UDP_Session - - - System\Ps2\DEV9\Sessions\UDP_Session - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\DEV9 - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\PAD - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS - - - System\Ps2\GS\GIF - - - System\Ps2\GS\Renderers\Direct3D11 - - - System\Ps2\GS\Renderers\Direct3D11 - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\OpenGL - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Software - - - System\Ps2\GS\Renderers\Null - - - System\Ps2\GS\Renderers\Null - - - System\Ps2\GS\Renderers\Null - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Renderers\Common - - - System\Ps2\GS\Window - - - System\Ps2\GS\Window - - - System\Ps2\GS - - - System\Ps2\GS\Window - - - System\Ps2\GS\Renderers\Direct3D11 - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - AppHost - - - System\Ps2\Iop - - - System\Ps2\Iop - - - AppHost - - - AppHost - - - AppHost - - - System\Ps2\PAD - - - System\Include - - - Host - - - Host - - - Host - - - Host - - - AppHost\Include - - - Host - - - Host - - - System\Ps2\GS\Renderers\Vulkan - - - System\Ps2\GS\Renderers\Vulkan - - - - System\Ps2\GS\Renderers\Hardware - - - System\Ps2\EmotionEngine\EE\Dynarec - - - AppHost - - - Host - - - System\Ps2\GS\Renderers\Direct3D12 - - - System\Ps2\GS\Renderers\Direct3D12 - - - AppHost - - - Host - - - Host - - - Host - - - Host - - - AppHost - - - Host - - - System\Include - - - System\Ps2\Iop - - - System\Ps2\Iop - - - System\Ps2\USB - - - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - System\Ps2\SPU2 - - - System\Ps2\PAD - - - System\Ps2\GS - - - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - System\Ps2\Debug\rdebug - - - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - AppHost\Resources - - - - - AppHost\Resources - - - \ No newline at end of file diff --git a/pcsx2/windows/WinConsolePipe.cpp b/pcsx2/windows/WinConsolePipe.cpp deleted file mode 100644 index cf49f908a3..0000000000 --- a/pcsx2/windows/WinConsolePipe.cpp +++ /dev/null @@ -1,239 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "Win32.h" - -#include "gui/App.h" -#include "gui/ConsoleLogger.h" - -// -------------------------------------------------------------------------------------- -// Win32 Console Pipes -// As a courtesy and convenience, we redirect stdout/stderr to the console and logfile. -// -------------------------------------------------------------------------------------- - -using namespace Threading; - -// -------------------------------------------------------------------------------------- -// WinPipeThread -// -------------------------------------------------------------------------------------- -class WinPipeThread : public pxThread -{ - typedef pxThread _parent; - -protected: - const HANDLE& m_outpipe; - const ConsoleColors m_color; - -public: - WinPipeThread( const HANDLE& outpipe, ConsoleColors color ) - : m_outpipe( outpipe ) - , m_color( color ) - { - m_name = (m_color == Color_Red) ? L"Redirect_Stderr" : L"Redirect_Stdout"; - } - - virtual ~WinPipeThread() - { - _parent::Cancel(); - } - -protected: - void ExecuteTaskInThread() - { - ::SetThreadPriority( ::GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL ); - if( m_outpipe == INVALID_HANDLE_VALUE ) return; - - try - { - if (ConnectNamedPipe(m_outpipe, nullptr) == 0 && GetLastError() != ERROR_PIPE_CONNECTED) - throw Exception::RuntimeError().SetDiagMsg("ConnectNamedPipe failed."); - - char s8_Buf[2049]; - DWORD u32_Read = 0; - - while( true ) - { - if( !ReadFile(m_outpipe, s8_Buf, sizeof(s8_Buf)-1, &u32_Read, NULL) ) - { - DWORD result = GetLastError(); - if( result == ERROR_HANDLE_EOF || result == ERROR_BROKEN_PIPE ) break; - if( result == ERROR_IO_PENDING ) - { - Yield( 10 ); - continue; - } - - throw Exception::WinApiError().SetDiagMsg("ReadFile from pipe failed."); - } - - if( u32_Read <= 3 ) - { - // Windows has a habit of sending 1 or 2 characters of every message, and then sending - // the rest in a second message. This is "ok" really, except our Console class is hardly - // free of overhead, so it's helpful if we can concatenate the couple of messages together. - // But we don't want to break the ability to print progressive status bars, like '....' - // so I use a clever Yield/Peek loop combo that keeps reading as long as there's new data - // immediately being fed to our pipe. :) --air - - DWORD u32_avail = 0; - - do - { - Yield(); - if( !PeekNamedPipe(m_outpipe, 0, 0, 0, &u32_avail, 0) ) - throw Exception::WinApiError().SetDiagMsg("Error peeking Pipe."); - - if( u32_avail == 0 ) break; - - DWORD loopread; - if( !ReadFile(m_outpipe, &s8_Buf[u32_Read], sizeof(s8_Buf)-u32_Read-1, &loopread, NULL) ) break; - u32_Read += loopread; - - } while( u32_Read < sizeof(s8_Buf)-32 ); - } - - // ATTENTION: The Console always prints ANSI to the pipe independent if compiled as UNICODE or MBCS! - s8_Buf[u32_Read] = 0; - - ConsoleColorScope cs(m_color); - Console.DoWriteFromStdout( s8_Buf ); - - TestCancel(); - } - } - catch( Exception::RuntimeError& ex ) - { - // Log error, and fail silently. It's not really important if the - // pipe fails. PCSX2 will run fine without it in any case. - Console.Error( ex.FormatDiagnosticMessage() ); - } - } -}; - -// -------------------------------------------------------------------------------------- -// WinPipeRedirection -// -------------------------------------------------------------------------------------- -class WinPipeRedirection : public PipeRedirectionBase -{ - DeclareNoncopyableObject( WinPipeRedirection ); - -protected: - HANDLE m_readpipe; - FILE* m_fp; - - WinPipeThread m_Thread; - -public: - WinPipeRedirection( FILE* stdstream ); - virtual ~WinPipeRedirection(); - - void Cleanup() noexcept; -}; - -WinPipeRedirection::WinPipeRedirection( FILE* stdstream ) - : m_readpipe(INVALID_HANDLE_VALUE) - , m_fp(nullptr) - , m_Thread(m_readpipe, (stdstream == stderr) ? Color_Red : Color_Black) -{ - pxAssert( (stdstream == stderr) || (stdstream == stdout) ); - - try - { - // freopen requires a pathname, so a named pipe must be used. The - // pathname needs to be unique to allow multiple instances of PCSX2 to - // work properly. - const wxString stream_name(stdstream == stderr ? L"stderr" : L"stdout"); - const wxString pipe_name(wxString::Format(L"\\\\.\\pipe\\pcsx2_%s%d", stream_name, GetCurrentProcessId())); - - m_readpipe = CreateNamedPipe(pipe_name, PIPE_ACCESS_INBOUND, 0, 1, 2048, 2048, 0, nullptr); - if (m_readpipe == INVALID_HANDLE_VALUE) - throw Exception::WinApiError().SetDiagMsg("CreateNamedPipe failed."); - - m_Thread.Start(); - - // Binary flag set to prevent multiple \r characters before each \n. - m_fp = _wfreopen(pipe_name, L"wb", stdstream); - if (m_fp == nullptr) - throw Exception::RuntimeError().SetDiagMsg("_wfreopen returned NULL."); - - setvbuf(stdstream, nullptr, _IONBF, 0); - } - catch( Exception::BaseThreadError& ex ) - { - // thread object will become invalid because of scoping after we leave - // the constructor, so re-pack a new exception: - - Cleanup(); - throw Exception::RuntimeError().SetDiagMsg( ex.FormatDiagnosticMessage() ).SetUserMsg( ex.FormatDisplayMessage() ); - } - catch( BaseException& ex ) - { - Cleanup(); - ex.DiagMsg() = (std::string)((stdstream==stdout) ? "STDOUT" : "STDERR") + " Redirection Init failed: " + ex.DiagMsg(); - throw; - } - catch( ... ) - { - // C++ doesn't execute the object destructor automatically, because it's fail++ - // (and I'm *not* encapsulating each handle into its own object >_<) - - Cleanup(); - throw; - } -} - -WinPipeRedirection::~WinPipeRedirection() -{ - Cleanup(); -} - -void WinPipeRedirection::Cleanup() noexcept -{ - // Cleanup Order Notes: - // * The redirection thread is most likely blocking on ReadFile(), so we can't Cancel yet, lest we deadlock -- - // Closing the writepipe (either directly or through the fp/crt handles) issues an EOF to the thread, - // so it's safe to Cancel afterward. - - if( m_fp != NULL ) - { - fclose( m_fp ); - m_fp = NULL; - } - - m_Thread.Cancel(); - - if( m_readpipe != INVALID_HANDLE_VALUE ) - { - CloseHandle( m_readpipe ); - m_readpipe = INVALID_HANDLE_VALUE; - } -} - -// The win32 specific implementation of PipeRedirection. -PipeRedirectionBase* NewPipeRedir( FILE* stdstream ) -{ - try - { - return new WinPipeRedirection( stdstream ); - } - catch( Exception::RuntimeError& ex ) - { - // Entirely non-critical errors. Log 'em and move along. - Console.Error( ex.FormatDiagnosticMessage() ); - } - - return NULL; -} diff --git a/pcsx2/windows/WinKeyCodes.cpp b/pcsx2/windows/WinKeyCodes.cpp deleted file mode 100644 index 9e891c376d..0000000000 --- a/pcsx2/windows/WinKeyCodes.cpp +++ /dev/null @@ -1,164 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs -* Copyright (C) 2002-2010 PCSX2 Dev Team -* -* PCSX2 is free software: you can redistribute it and/or modify it under the terms -* of the GNU Lesser General Public License as published by the Free Software Found- -* ation, either version 3 of the License, or (at your option) any later version. -* -* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; -* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -* PURPOSE. See the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along with PCSX2. -* If not, see . -*/ - -#include "PrecompiledHeader.h" -#include "common/Assertions.h" -#include "common/RedtapeWindows.h" - -// VK values without MS constants. see - https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731%28v=vs.85%29.aspx -#define PX_VK_A 0x41 -#define PX_VK_Z 0x5A - -#define PX_VK2WX_SIZE 256 -static int vk2wx[PX_VK2WX_SIZE] = { 0 }; -static bool initialized = false; - -static void addTx(UINT vkCode, int wxCode) -{ - pxAssert(vkCode < PX_VK2WX_SIZE); - pxAssert(!vk2wx[vkCode]); // we shouldn't override entries here - vk2wx[vkCode] = wxCode; -} - -static void initTable() -{ - // Shift, Control, Alt and Menu - addTx(VK_SHIFT, WXK_SHIFT); - addTx(VK_LSHIFT, WXK_SHIFT); - addTx(VK_RSHIFT, WXK_SHIFT); - - addTx(VK_CONTROL, WXK_CONTROL); - addTx(VK_LCONTROL, WXK_CONTROL); - addTx(VK_RCONTROL, WXK_CONTROL); - - addTx(VK_MENU, WXK_ALT); - addTx(VK_LMENU, WXK_ALT); - addTx(VK_RMENU, WXK_ALT); - - addTx(VK_LWIN, WXK_WINDOWS_LEFT); - addTx(VK_RWIN, WXK_WINDOWS_RIGHT); - - addTx(VK_APPS, WXK_WINDOWS_MENU); - - // Scroll, Caps and numlocks - addTx(VK_SCROLL, WXK_SCROLL); - addTx(VK_CAPITAL, WXK_CAPITAL); - addTx(VK_NUMLOCK, WXK_NUMLOCK); - - // cursor and other extended keyboard keys - addTx(VK_PRIOR, WXK_PAGEUP); - addTx(VK_NEXT, WXK_PAGEDOWN); - addTx(VK_HOME, WXK_HOME); - addTx(VK_END, WXK_END); - addTx(VK_LEFT, WXK_LEFT); - addTx(VK_UP, WXK_UP); - addTx(VK_RIGHT, WXK_RIGHT); - addTx(VK_DOWN, WXK_DOWN); - addTx(VK_INSERT, WXK_INSERT); - addTx(VK_DELETE, WXK_DELETE); - - // numpad keys - addTx(VK_NUMPAD0, WXK_NUMPAD0); - addTx(VK_NUMPAD1, WXK_NUMPAD1); - addTx(VK_NUMPAD2, WXK_NUMPAD2); - addTx(VK_NUMPAD3, WXK_NUMPAD3); - addTx(VK_NUMPAD4, WXK_NUMPAD4); - addTx(VK_NUMPAD5, WXK_NUMPAD5); - addTx(VK_NUMPAD6, WXK_NUMPAD6); - addTx(VK_NUMPAD7, WXK_NUMPAD7); - addTx(VK_NUMPAD8, WXK_NUMPAD8); - addTx(VK_NUMPAD9, WXK_NUMPAD9); - addTx(VK_MULTIPLY, WXK_NUMPAD_MULTIPLY); - addTx(VK_ADD, WXK_NUMPAD_ADD); - addTx(VK_SEPARATOR, WXK_NUMPAD_SEPARATOR); - addTx(VK_SUBTRACT, WXK_NUMPAD_SUBTRACT); - addTx(VK_DECIMAL, WXK_NUMPAD_DECIMAL); - addTx(VK_DIVIDE, WXK_NUMPAD_DIVIDE); - - // Function keys - addTx(VK_F1, WXK_F1); - addTx(VK_F2, WXK_F2); - addTx(VK_F3, WXK_F3); - addTx(VK_F4, WXK_F4); - addTx(VK_F5, WXK_F5); - addTx(VK_F6, WXK_F6); - addTx(VK_F7, WXK_F7); - addTx(VK_F8, WXK_F8); - addTx(VK_F9, WXK_F9); - addTx(VK_F10, WXK_F10); - addTx(VK_F11, WXK_F11); - addTx(VK_F12, WXK_F12); - addTx(VK_F13, WXK_F13); - addTx(VK_F14, WXK_F14); - addTx(VK_F15, WXK_F15); - addTx(VK_F16, WXK_F16); - addTx(VK_F17, WXK_F17); - addTx(VK_F18, WXK_F18); - addTx(VK_F19, WXK_F19); - addTx(VK_F20, WXK_F20); - addTx(VK_F21, WXK_F21); - addTx(VK_F22, WXK_F22); - addTx(VK_F23, WXK_F23); - addTx(VK_F24, WXK_F24); - - // various other special keys - addTx(VK_BACK, WXK_BACK); - addTx(VK_TAB, WXK_TAB); - addTx(VK_RETURN, WXK_RETURN); - addTx(VK_ESCAPE, WXK_ESCAPE); - addTx(VK_SNAPSHOT, WXK_SNAPSHOT); - addTx(VK_PAUSE, WXK_PAUSE); - - // Not sure what these keys are - addTx(VK_CLEAR, WXK_CLEAR); - addTx(VK_HELP, WXK_HELP); - addTx(VK_SELECT, WXK_SELECT); - addTx(VK_EXECUTE, WXK_EXECUTE); - addTx(VK_PRINT, WXK_PRINT); - - // symbol-only keys on all keyboards - return ascii - addTx(VK_OEM_PERIOD, '.'); - addTx(VK_OEM_PLUS, '='); - addTx(VK_OEM_MINUS, '-'); - addTx(VK_OEM_COMMA, ','); - - // symbol-only keys on US keyboards - return ascii - addTx(VK_OEM_1, ';'); - addTx(VK_OEM_2, '/'); - addTx(VK_OEM_3, '`'); - addTx(VK_OEM_4, '['); - addTx(VK_OEM_5, '\\'); - addTx(VK_OEM_6, ']'); - addTx(VK_OEM_7, '\''); - - pxAssert(PX_VK_A < PX_VK_Z); - // VK codes for letter keys - return lower case ascii - for (UINT i = PX_VK_A; i <= PX_VK_Z; i++) - addTx(i, i + 'a' - PX_VK_A); - - initialized = true; -} - - -// Returns a WXK_* keycode translated from a VK_* virtual key. wxCharCodeMSWToWx was -// removed from wxWidgets 3, this should work as a replacement. -// Where an ascii code for a printable char exists, we try to return it -int TranslateVKToWXK(u32 keysym) -{ - if (!initialized) - initTable(); - - return keysym < PX_VK2WX_SIZE ? vk2wx[keysym] : 0; -} diff --git a/pcsx2/windows/WinPowerProfile.cpp b/pcsx2/windows/WinPowerProfile.cpp deleted file mode 100644 index a83f310fb4..0000000000 --- a/pcsx2/windows/WinPowerProfile.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs -* Copyright (C) 2002-2021 PCSX2 Dev Team -* -* PCSX2 is free software: you can redistribute it and/or modify it under the terms -* of the GNU Lesser General Public License as published by the Free Software Found- -* ation, either version 3 of the License, or (at your option) any later version. -* -* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; -* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -* PURPOSE. See the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along with PCSX2. -* If not, see . -*/ - -#include "PrecompiledHeader.h" -#include "common/StringUtil.h" -#include "common/RedtapeWindows.h" - -#include -#include - -using unique_any_guidptr = wil::unique_any; - -// Checks the current active power plan -// This function fails silently -void CheckIsUserOnHighPerfPowerPlan() -{ - unique_any_guidptr pPwrGUID; - DWORD ret = PowerGetActiveScheme(NULL, pPwrGUID.put()); - if (ret != ERROR_SUCCESS) - return; - - UCHAR aBuffer[2048]; - DWORD aBufferSize = sizeof(aBuffer); - ret = PowerReadFriendlyName(NULL, pPwrGUID.get(), &NO_SUBGROUP_GUID, NULL, aBuffer, &aBufferSize); - std::string friendlyName(StringUtil::WideStringToUTF8String((wchar_t*)aBuffer)); - if (ret != ERROR_SUCCESS) - return; - - DWORD acMax = 0,acMin = 0,dcMax = 0,dcMin = 0; - - if (PowerReadACValueIndex(NULL, pPwrGUID.get(), &GUID_PROCESSOR_SETTINGS_SUBGROUP, &GUID_PROCESSOR_THROTTLE_MAXIMUM, &acMax) || - PowerReadACValueIndex(NULL, pPwrGUID.get(), &GUID_PROCESSOR_SETTINGS_SUBGROUP, &GUID_PROCESSOR_THROTTLE_MINIMUM, &acMin) || - PowerReadDCValueIndex(NULL, pPwrGUID.get(), &GUID_PROCESSOR_SETTINGS_SUBGROUP, &GUID_PROCESSOR_THROTTLE_MAXIMUM, &dcMax) || - PowerReadDCValueIndex(NULL, pPwrGUID.get(), &GUID_PROCESSOR_SETTINGS_SUBGROUP, &GUID_PROCESSOR_THROTTLE_MINIMUM, &dcMin)) - return; - - Console.WriteLn("The current power profile is '%s'.\nThe current min / max processor states\nAC: %d%% / %d%%\nBattery: %d%% / %d%%\n", friendlyName.c_str(), acMin, acMax, dcMin, dcMax); -}