mirror of
https://github.com/RetroDECK/Duckstation.git
synced 2024-09-17 08:02:41 +00:00
Replace duckstation-sdl with stub directing users to duckstation-qt
This commit is contained in:
Connor McLaughlin
parent
cae5bc1712
commit
dc0eb4cb04
|
|
@ -10,7 +10,7 @@ add_executable(duckstation-nogui
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(duckstation-nogui PRIVATE ${SDL2_INCLUDE_DIRS})
|
target_include_directories(duckstation-nogui PRIVATE ${SDL2_INCLUDE_DIRS})
|
||||||
target_link_libraries(duckstation-nogui PRIVATE core common imgui nativefiledialog glad frontend-common scmversion vulkan-loader ${SDL2_LIBRARIES})
|
target_link_libraries(duckstation-nogui PRIVATE core common imgui glad frontend-common scmversion vulkan-loader ${SDL2_LIBRARIES})
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
target_sources(duckstation-nogui PRIVATE
|
target_sources(duckstation-nogui PRIVATE
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,7 @@
|
||||||
add_executable(duckstation-sdl
|
add_executable(duckstation-sdl
|
||||||
imgui_impl_sdl.cpp
|
|
||||||
imgui_impl_sdl.h
|
|
||||||
main.cpp
|
main.cpp
|
||||||
sdl_host_interface.cpp
|
|
||||||
sdl_host_interface.h
|
|
||||||
sdl_key_names.h
|
|
||||||
sdl_util.cpp
|
|
||||||
sdl_util.h
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(duckstation-sdl PRIVATE ${SDL2_INCLUDE_DIRS})
|
|
||||||
target_link_libraries(duckstation-sdl PRIVATE core common imgui nativefiledialog glad frontend-common scmversion vulkan-loader ${SDL2_LIBRARIES})
|
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
target_sources(duckstation-sdl PRIVATE
|
target_sources(duckstation-sdl PRIVATE
|
||||||
duckstation-sdl.manifest
|
duckstation-sdl.manifest
|
||||||
|
|
|
||||||
|
|
@ -51,37 +51,10 @@
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\dep\imgui\imgui.vcxproj">
|
|
||||||
<Project>{bb08260f-6fbc-46af-8924-090ee71360c6}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\dep\nativefiledialog\nativefiledialog.vcxproj">
|
|
||||||
<Project>{ace32f47-2960-4fb3-9f77-2c375625bf61}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\common\common.vcxproj">
|
|
||||||
<Project>{ee054e08-3799-4a59-a422-18259c105ffd}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\core\core.vcxproj">
|
|
||||||
<Project>{868b98c8-65a1-494b-8346-250a73a48c0a}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\frontend-common\frontend-common.vcxproj">
|
|
||||||
<Project>{6245dec8-d2da-47ee-a373-cbd6fcf3ece6}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\scmversion\scmversion.vcxproj">
|
|
||||||
<Project>{075ced82-6a20-46df-94c7-9624ac9ddbeb}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="imgui_impl_sdl.cpp" />
|
|
||||||
<ClCompile Include="sdl_host_interface.cpp" />
|
|
||||||
<ClCompile Include="main.cpp" />
|
<ClCompile Include="main.cpp" />
|
||||||
<ClCompile Include="sdl_util.cpp" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="imgui_impl_sdl.h" />
|
|
||||||
<ClInclude Include="resource.h" />
|
<ClInclude Include="resource.h" />
|
||||||
<ClInclude Include="sdl_host_interface.h" />
|
|
||||||
<ClInclude Include="sdl_key_names.h" />
|
|
||||||
<ClInclude Include="sdl_util.h" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Manifest Include="duckstation-sdl.manifest" />
|
<Manifest Include="duckstation-sdl.manifest" />
|
||||||
|
|
@ -99,9 +72,6 @@
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
<Import Project="..\..\dep\msvc\vsprops\SDL2Compile.props" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
|
@ -301,10 +271,10 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -314,7 +284,6 @@
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
|
@ -323,10 +292,10 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -336,7 +305,6 @@
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||||
|
|
@ -345,10 +313,10 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -358,7 +326,6 @@
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
||||||
|
|
@ -367,10 +334,10 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
|
@ -383,7 +350,6 @@
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
||||||
|
|
@ -392,10 +358,10 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
|
@ -408,7 +374,6 @@
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|ARM64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|ARM64'">
|
||||||
|
|
@ -417,10 +382,10 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
|
@ -433,7 +398,6 @@
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
|
@ -443,8 +407,8 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -456,7 +420,6 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
@ -467,8 +430,8 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -481,7 +444,6 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
@ -492,8 +454,8 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -505,7 +467,6 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
@ -516,8 +477,8 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -529,7 +490,6 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
@ -540,8 +500,8 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -554,7 +514,6 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
@ -565,8 +524,8 @@
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WITH_DISCORD_PRESENCE=1;WITH_SDL2=1;WITH_IMGUI=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)dep\msvc\include;$(SolutionDir)dep\msvc\include\SDL;$(SolutionDir)dep\imgui\include;$(SolutionDir)dep\nativefiledialog\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
|
@ -579,7 +538,6 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>SDL2.lib;SDL2main.lib;dxgi.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,9 @@
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="main.cpp" />
|
<ClCompile Include="main.cpp" />
|
||||||
<ClCompile Include="sdl_host_interface.cpp" />
|
|
||||||
<ClCompile Include="imgui_impl_sdl.cpp" />
|
|
||||||
<ClCompile Include="sdl_util.cpp" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="sdl_host_interface.h" />
|
|
||||||
<ClInclude Include="imgui_impl_sdl.h" />
|
|
||||||
<ClInclude Include="sdl_key_names.h" />
|
|
||||||
<ClInclude Include="resource.h" />
|
<ClInclude Include="resource.h" />
|
||||||
<ClInclude Include="sdl_util.h" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Manifest Include="duckstation-sdl.manifest" />
|
<Manifest Include="duckstation-sdl.manifest" />
|
||||||
|
|
|
||||||
|
|
@ -1,260 +0,0 @@
|
||||||
// dear imgui: Platform Binding for SDL2
|
|
||||||
// This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..)
|
|
||||||
// (Info: SDL2 is a cross-platform general purpose library for handling windows, inputs, graphics context creation, etc.)
|
|
||||||
// (Requires: SDL 2.0. Prefer SDL 2.0.4+ for full feature support.)
|
|
||||||
|
|
||||||
// Implemented features:
|
|
||||||
// [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
|
|
||||||
// [X] Platform: Clipboard support.
|
|
||||||
// [X] Platform: Keyboard arrays indexed using SDL_SCANCODE_* codes, e.g. ImGui::IsKeyPressed(SDL_SCANCODE_SPACE).
|
|
||||||
// [X] Platform: Gamepad support. Enabled with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'.
|
|
||||||
// [X] Platform: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'.
|
|
||||||
// Missing features:
|
|
||||||
// [ ] Platform: SDL2 handling of IME under Windows appears to be broken and it explicitly disable the regular Windows IME. You can restore Windows IME by compiling SDL with SDL_DISABLE_WINDOWS_IME.
|
|
||||||
// [ ] Platform: Multi-viewport + Minimized windows seems to break mouse wheel events (at least under Windows).
|
|
||||||
|
|
||||||
// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this.
|
|
||||||
// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp.
|
|
||||||
// https://github.com/ocornut/imgui
|
|
||||||
|
|
||||||
// CHANGELOG
|
|
||||||
// (minor and older changes stripped away, please see git history for details)
|
|
||||||
// 2019-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface.
|
|
||||||
// 2019-07-21: Inputs: Added mapping for ImGuiKey_KeyPadEnter.
|
|
||||||
// 2019-04-23: Inputs: Added support for SDL_GameController (if ImGuiConfigFlags_NavEnableGamepad is set by user application).
|
|
||||||
// 2019-03-12: Misc: Preserve DisplayFramebufferScale when main window is minimized.
|
|
||||||
// 2018-12-21: Inputs: Workaround for Android/iOS which don't seem to handle focus related calls.
|
|
||||||
// 2018-11-30: Misc: Setting up io.BackendPlatformName so it can be displayed in the About Window.
|
|
||||||
// 2018-11-14: Changed the signature of ImGui_ImplSDL2_ProcessEvent() to take a 'const SDL_Event*'.
|
|
||||||
// 2018-08-01: Inputs: Workaround for Emscripten which doesn't seem to handle focus related calls.
|
|
||||||
// 2018-06-29: Inputs: Added support for the ImGuiMouseCursor_Hand cursor.
|
|
||||||
// 2018-06-08: Misc: Extracted imgui_impl_sdl.cpp/.h away from the old combined SDL2+OpenGL/Vulkan examples.
|
|
||||||
// 2018-06-08: Misc: ImGui_ImplSDL2_InitForOpenGL() now takes a SDL_GLContext parameter.
|
|
||||||
// 2018-05-09: Misc: Fixed clipboard paste memory leak (we didn't call SDL_FreeMemory on the data returned by SDL_GetClipboardText).
|
|
||||||
// 2018-03-20: Misc: Setup io.BackendFlags ImGuiBackendFlags_HasMouseCursors flag + honor ImGuiConfigFlags_NoMouseCursorChange flag.
|
|
||||||
// 2018-02-16: Inputs: Added support for mouse cursors, honoring ImGui::GetMouseCursor() value.
|
|
||||||
// 2018-02-06: Misc: Removed call to ImGui::Shutdown() which is not available from 1.60 WIP, user needs to call CreateContext/DestroyContext themselves.
|
|
||||||
// 2018-02-06: Inputs: Added mapping for ImGuiKey_Space.
|
|
||||||
// 2018-02-05: Misc: Using SDL_GetPerformanceCounter() instead of SDL_GetTicks() to be able to handle very high framerate (1000+ FPS).
|
|
||||||
// 2018-02-05: Inputs: Keyboard mapping is using scancodes everywhere instead of a confusing mixture of keycodes and scancodes.
|
|
||||||
// 2018-01-20: Inputs: Added Horizontal Mouse Wheel support.
|
|
||||||
// 2018-01-19: Inputs: When available (SDL 2.0.4+) using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. Otherwise (SDL 2.0.3 and before) testing for SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS.
|
|
||||||
// 2018-01-18: Inputs: Added mapping for ImGuiKey_Insert.
|
|
||||||
// 2017-08-25: Inputs: MousePos set to -FLT_MAX,-FLT_MAX when mouse is unavailable/missing (instead of -1,-1).
|
|
||||||
// 2016-10-15: Misc: Added a void* user_data parameter to Clipboard function handlers.
|
|
||||||
|
|
||||||
#include "imgui.h"
|
|
||||||
#include "imgui_impl_sdl.h"
|
|
||||||
|
|
||||||
// SDL
|
|
||||||
// (the multi-viewports feature requires SDL features supported from SDL 2.0.4+. SDL 2.0.5+ is highly recommended)
|
|
||||||
#include <SDL.h>
|
|
||||||
#include <SDL_syswm.h>
|
|
||||||
#if defined(__APPLE__)
|
|
||||||
#include "TargetConditionals.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE SDL_VERSION_ATLEAST(2,0,4)
|
|
||||||
#define SDL_HAS_WINDOW_ALPHA SDL_VERSION_ATLEAST(2,0,5)
|
|
||||||
#define SDL_HAS_ALWAYS_ON_TOP SDL_VERSION_ATLEAST(2,0,5)
|
|
||||||
#define SDL_HAS_USABLE_DISPLAY_BOUNDS SDL_VERSION_ATLEAST(2,0,5)
|
|
||||||
#define SDL_HAS_PER_MONITOR_DPI SDL_VERSION_ATLEAST(2,0,4)
|
|
||||||
#define SDL_HAS_VULKAN SDL_VERSION_ATLEAST(2,0,6)
|
|
||||||
#define SDL_HAS_MOUSE_FOCUS_CLICKTHROUGH SDL_VERSION_ATLEAST(2,0,5)
|
|
||||||
#if !SDL_HAS_VULKAN
|
|
||||||
static const Uint32 SDL_WINDOW_VULKAN = 0x10000000;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Data
|
|
||||||
static SDL_Window* g_Window = NULL;
|
|
||||||
static Uint64 g_Time = 0;
|
|
||||||
static bool g_MousePressed[3] = { false, false, false };
|
|
||||||
static SDL_Cursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = {};
|
|
||||||
static char* g_ClipboardTextData = NULL;
|
|
||||||
|
|
||||||
static const char* ImGui_ImplSDL2_GetClipboardText(void*)
|
|
||||||
{
|
|
||||||
if (g_ClipboardTextData)
|
|
||||||
SDL_free(g_ClipboardTextData);
|
|
||||||
g_ClipboardTextData = SDL_GetClipboardText();
|
|
||||||
return g_ClipboardTextData;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ImGui_ImplSDL2_SetClipboardText(void*, const char* text)
|
|
||||||
{
|
|
||||||
SDL_SetClipboardText(text);
|
|
||||||
}
|
|
||||||
|
|
||||||
// You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs.
|
|
||||||
// - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application.
|
|
||||||
// - When io.WantCaptureKeyboard is true, do not dispatch keyboard input data to your main application.
|
|
||||||
// Generally you may always pass all inputs to dear imgui, and hide them from your application based on those two flags.
|
|
||||||
// If you have multiple SDL events and some of them are not meant to be used by dear imgui, you may need to filter events based on their windowID field.
|
|
||||||
bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event)
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
switch (event->type)
|
|
||||||
{
|
|
||||||
case SDL_MOUSEWHEEL:
|
|
||||||
{
|
|
||||||
if (event->wheel.x > 0) io.MouseWheelH += 1;
|
|
||||||
if (event->wheel.x < 0) io.MouseWheelH -= 1;
|
|
||||||
if (event->wheel.y > 0) io.MouseWheel += 1;
|
|
||||||
if (event->wheel.y < 0) io.MouseWheel -= 1;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_MOUSEBUTTONDOWN:
|
|
||||||
{
|
|
||||||
if (event->button.button == SDL_BUTTON_LEFT) g_MousePressed[0] = true;
|
|
||||||
if (event->button.button == SDL_BUTTON_RIGHT) g_MousePressed[1] = true;
|
|
||||||
if (event->button.button == SDL_BUTTON_MIDDLE) g_MousePressed[2] = true;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_TEXTINPUT:
|
|
||||||
{
|
|
||||||
io.AddInputCharactersUTF8(event->text.text);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_KEYDOWN:
|
|
||||||
case SDL_KEYUP:
|
|
||||||
{
|
|
||||||
int key = event->key.keysym.scancode;
|
|
||||||
IM_ASSERT(key >= 0 && key < IM_ARRAYSIZE(io.KeysDown));
|
|
||||||
io.KeysDown[key] = (event->type == SDL_KEYDOWN);
|
|
||||||
io.KeyShift = ((SDL_GetModState() & KMOD_SHIFT) != 0);
|
|
||||||
io.KeyCtrl = ((SDL_GetModState() & KMOD_CTRL) != 0);
|
|
||||||
io.KeyAlt = ((SDL_GetModState() & KMOD_ALT) != 0);
|
|
||||||
io.KeySuper = ((SDL_GetModState() & KMOD_GUI) != 0);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ImGui_ImplSDL2_Init(SDL_Window* window)
|
|
||||||
{
|
|
||||||
g_Window = window;
|
|
||||||
|
|
||||||
// Setup back-end capabilities flags
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors; // We can honor GetMouseCursor() values (optional)
|
|
||||||
io.BackendPlatformName = "imgui_impl_sdl";
|
|
||||||
|
|
||||||
// Keyboard mapping. ImGui will use those indices to peek into the io.KeysDown[] array.
|
|
||||||
io.KeyMap[ImGuiKey_Tab] = SDL_SCANCODE_TAB;
|
|
||||||
io.KeyMap[ImGuiKey_LeftArrow] = SDL_SCANCODE_LEFT;
|
|
||||||
io.KeyMap[ImGuiKey_RightArrow] = SDL_SCANCODE_RIGHT;
|
|
||||||
io.KeyMap[ImGuiKey_UpArrow] = SDL_SCANCODE_UP;
|
|
||||||
io.KeyMap[ImGuiKey_DownArrow] = SDL_SCANCODE_DOWN;
|
|
||||||
io.KeyMap[ImGuiKey_PageUp] = SDL_SCANCODE_PAGEUP;
|
|
||||||
io.KeyMap[ImGuiKey_PageDown] = SDL_SCANCODE_PAGEDOWN;
|
|
||||||
io.KeyMap[ImGuiKey_Home] = SDL_SCANCODE_HOME;
|
|
||||||
io.KeyMap[ImGuiKey_End] = SDL_SCANCODE_END;
|
|
||||||
io.KeyMap[ImGuiKey_Insert] = SDL_SCANCODE_INSERT;
|
|
||||||
io.KeyMap[ImGuiKey_Delete] = SDL_SCANCODE_DELETE;
|
|
||||||
io.KeyMap[ImGuiKey_Backspace] = SDL_SCANCODE_BACKSPACE;
|
|
||||||
io.KeyMap[ImGuiKey_Space] = SDL_SCANCODE_SPACE;
|
|
||||||
io.KeyMap[ImGuiKey_Enter] = SDL_SCANCODE_RETURN;
|
|
||||||
io.KeyMap[ImGuiKey_Escape] = SDL_SCANCODE_ESCAPE;
|
|
||||||
io.KeyMap[ImGuiKey_KeyPadEnter] = SDL_SCANCODE_RETURN2;
|
|
||||||
io.KeyMap[ImGuiKey_A] = SDL_SCANCODE_A;
|
|
||||||
io.KeyMap[ImGuiKey_C] = SDL_SCANCODE_C;
|
|
||||||
io.KeyMap[ImGuiKey_V] = SDL_SCANCODE_V;
|
|
||||||
io.KeyMap[ImGuiKey_X] = SDL_SCANCODE_X;
|
|
||||||
io.KeyMap[ImGuiKey_Y] = SDL_SCANCODE_Y;
|
|
||||||
io.KeyMap[ImGuiKey_Z] = SDL_SCANCODE_Z;
|
|
||||||
|
|
||||||
io.SetClipboardTextFn = ImGui_ImplSDL2_SetClipboardText;
|
|
||||||
io.GetClipboardTextFn = ImGui_ImplSDL2_GetClipboardText;
|
|
||||||
io.ClipboardUserData = NULL;
|
|
||||||
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_Arrow] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_TextInput] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_ResizeAll] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL);
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_ResizeNS] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS);
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_ResizeEW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE);
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_ResizeNESW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW);
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_ResizeNWSE] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE);
|
|
||||||
g_MouseCursors[ImGuiMouseCursor_Hand] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImGui_ImplSDL2_Shutdown()
|
|
||||||
{
|
|
||||||
g_Window = NULL;
|
|
||||||
|
|
||||||
// Destroy last known clipboard data
|
|
||||||
if (g_ClipboardTextData)
|
|
||||||
SDL_free(g_ClipboardTextData);
|
|
||||||
g_ClipboardTextData = NULL;
|
|
||||||
|
|
||||||
// Destroy SDL mouse cursors
|
|
||||||
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
|
|
||||||
SDL_FreeCursor(g_MouseCursors[cursor_n]);
|
|
||||||
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));
|
|
||||||
}
|
|
||||||
|
|
||||||
// This code is incredibly messy because some of the functions we need for full viewport support are not available in SDL < 2.0.4.
|
|
||||||
static void ImGui_ImplSDL2_UpdateMousePosAndButtons()
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
|
|
||||||
// [1]
|
|
||||||
// Only when requested by io.WantSetMousePos: set OS mouse pos from Dear ImGui mouse pos.
|
|
||||||
// (rarely used, mostly when ImGuiConfigFlags_NavEnableSetMousePos is enabled by user)
|
|
||||||
if (io.WantSetMousePos)
|
|
||||||
{
|
|
||||||
SDL_WarpMouseInWindow(g_Window, (int)io.MousePos.x, (int)io.MousePos.y);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX);
|
|
||||||
}
|
|
||||||
|
|
||||||
// [2]
|
|
||||||
// Set Dear ImGui mouse pos from OS mouse pos + get buttons. (this is the common behavior)
|
|
||||||
int mouse_x_local, mouse_y_local;
|
|
||||||
Uint32 mouse_buttons = SDL_GetMouseState(&mouse_x_local, &mouse_y_local);
|
|
||||||
io.MouseDown[0] = g_MousePressed[0] || (mouse_buttons & SDL_BUTTON(SDL_BUTTON_LEFT)) != 0; // If a mouse press event came, always pass it as "mouse held this frame", so we don't miss click-release events that are shorter than 1 frame.
|
|
||||||
io.MouseDown[1] = g_MousePressed[1] || (mouse_buttons & SDL_BUTTON(SDL_BUTTON_RIGHT)) != 0;
|
|
||||||
io.MouseDown[2] = g_MousePressed[2] || (mouse_buttons & SDL_BUTTON(SDL_BUTTON_MIDDLE)) != 0;
|
|
||||||
g_MousePressed[0] = g_MousePressed[1] = g_MousePressed[2] = false;
|
|
||||||
|
|
||||||
// SDL 2.0.3 and before: single-viewport only
|
|
||||||
if (SDL_GetWindowFlags(g_Window) & SDL_WINDOW_INPUT_FOCUS)
|
|
||||||
io.MousePos = ImVec2((float)mouse_x_local, (float)mouse_y_local);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ImGui_ImplSDL2_UpdateMouseCursor()
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange)
|
|
||||||
return;
|
|
||||||
|
|
||||||
ImGuiMouseCursor imgui_cursor = ImGui::GetMouseCursor();
|
|
||||||
if (io.MouseDrawCursor || imgui_cursor == ImGuiMouseCursor_None)
|
|
||||||
{
|
|
||||||
// Hide OS mouse cursor if imgui is drawing it or if it wants no cursor
|
|
||||||
SDL_ShowCursor(SDL_FALSE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Show OS mouse cursor
|
|
||||||
SDL_SetCursor(g_MouseCursors[imgui_cursor] ? g_MouseCursors[imgui_cursor] : g_MouseCursors[ImGuiMouseCursor_Arrow]);
|
|
||||||
SDL_ShowCursor(SDL_TRUE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImGui_ImplSDL2_NewFrame()
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
|
|
||||||
// Setup time step (we don't use SDL_GetTicks() because it is using millisecond resolution)
|
|
||||||
static Uint64 frequency = SDL_GetPerformanceFrequency();
|
|
||||||
Uint64 current_time = SDL_GetPerformanceCounter();
|
|
||||||
io.DeltaTime = g_Time > 0 ? (float)((double)(current_time - g_Time) / frequency) : (float)(1.0f / 60.0f);
|
|
||||||
g_Time = current_time;
|
|
||||||
|
|
||||||
ImGui_ImplSDL2_UpdateMousePosAndButtons();
|
|
||||||
ImGui_ImplSDL2_UpdateMouseCursor();
|
|
||||||
}
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
// dear imgui: Platform Binding for SDL2
|
|
||||||
// This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..)
|
|
||||||
// (Info: SDL2 is a cross-platform general purpose library for handling windows, inputs, graphics context creation, etc.)
|
|
||||||
|
|
||||||
// Implemented features:
|
|
||||||
// [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
|
|
||||||
// [X] Platform: Clipboard support.
|
|
||||||
// [X] Platform: Keyboard arrays indexed using SDL_SCANCODE_* codes, e.g. ImGui::IsKeyPressed(SDL_SCANCODE_SPACE).
|
|
||||||
// [X] Platform: Gamepad support. Enabled with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'.
|
|
||||||
// [X] Platform: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'.
|
|
||||||
// Missing features:
|
|
||||||
// [ ] Platform: SDL2 handling of IME under Windows appears to be broken and it explicitly disable the regular Windows IME. You can restore Windows IME by compiling SDL with SDL_DISABLE_WINDOWS_IME.
|
|
||||||
// [ ] Platform: Multi-viewport + Minimized windows seems to break mouse wheel events (at least under Windows).
|
|
||||||
|
|
||||||
// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this.
|
|
||||||
// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp.
|
|
||||||
// https://github.com/ocornut/imgui
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#include "imgui.h"
|
|
||||||
|
|
||||||
struct SDL_Window;
|
|
||||||
typedef union SDL_Event SDL_Event;
|
|
||||||
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_Init(SDL_Window* window);
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplSDL2_Shutdown();
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplSDL2_NewFrame();
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
|
|
||||||
|
|
@ -1,48 +1,27 @@
|
||||||
#include "common/assert.h"
|
#ifdef _WIN32
|
||||||
#include "common/log.h"
|
#include "common/windows_headers.h"
|
||||||
#include "core/system.h"
|
#endif
|
||||||
#include "frontend-common/sdl_initializer.h"
|
|
||||||
#include "sdl_host_interface.h"
|
|
||||||
#include <SDL.h>
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
int main(int argc, char* argv[])
|
static const char message[] = "The DuckStation SDL frontend has been removed and replaced with the Fullscreen UI.\n\n"
|
||||||
{
|
"Please use duckstation-qt instead.";
|
||||||
FrontendCommon::EnsureSDLInitialized();
|
|
||||||
|
|
||||||
std::unique_ptr<SDLHostInterface> host_interface = SDLHostInterface::Create();
|
|
||||||
std::unique_ptr<SystemBootParameters> boot_params;
|
|
||||||
if (!host_interface->ParseCommandLineParameters(argc, argv, &boot_params))
|
|
||||||
{
|
|
||||||
SDL_Quit();
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!host_interface->Initialize())
|
|
||||||
{
|
|
||||||
host_interface->Shutdown();
|
|
||||||
SDL_Quit();
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (boot_params)
|
#ifdef _WIN32
|
||||||
{
|
|
||||||
if (!host_interface->BootSystem(*boot_params) && host_interface->InBatchMode())
|
|
||||||
{
|
|
||||||
host_interface->Shutdown();
|
|
||||||
host_interface.reset();
|
|
||||||
SDL_Quit();
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
boot_params.reset();
|
int WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
|
||||||
}
|
{
|
||||||
|
MessageBoxA(nullptr, message, "DuckStation", MB_OK | MB_ICONERROR);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
host_interface->Run();
|
#else
|
||||||
host_interface->Shutdown();
|
|
||||||
host_interface.reset();
|
|
||||||
|
|
||||||
SDL_Quit();
|
int main(int argc, char* argv[])
|
||||||
return EXIT_SUCCESS;
|
{
|
||||||
|
std::fputs(message, stderr);
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,108 +0,0 @@
|
||||||
#pragma once
|
|
||||||
#include "common/gl/program.h"
|
|
||||||
#include "common/gl/texture.h"
|
|
||||||
#include "core/host_display.h"
|
|
||||||
#include "core/host_interface.h"
|
|
||||||
#include "frontend-common/common_host_interface.h"
|
|
||||||
#include <SDL.h>
|
|
||||||
#include <array>
|
|
||||||
#include <deque>
|
|
||||||
#include <map>
|
|
||||||
#include <memory>
|
|
||||||
#include <mutex>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
class AudioStream;
|
|
||||||
|
|
||||||
class INISettingsInterface;
|
|
||||||
|
|
||||||
class SDLHostInterface final : public CommonHostInterface
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
SDLHostInterface();
|
|
||||||
~SDLHostInterface();
|
|
||||||
|
|
||||||
static std::unique_ptr<SDLHostInterface> Create();
|
|
||||||
|
|
||||||
const char* GetFrontendName() const override;
|
|
||||||
|
|
||||||
void ReportError(const char* message) override;
|
|
||||||
void ReportMessage(const char* message) override;
|
|
||||||
bool ConfirmMessage(const char* message) override;
|
|
||||||
|
|
||||||
bool Initialize() override;
|
|
||||||
void Shutdown() override;
|
|
||||||
|
|
||||||
std::string GetStringSettingValue(const char* section, const char* key, const char* default_value = "") override;
|
|
||||||
bool GetBoolSettingValue(const char* section, const char* key, bool default_value = false) override;
|
|
||||||
int GetIntSettingValue(const char* section, const char* key, int default_value = 0) override;
|
|
||||||
float GetFloatSettingValue(const char* section, const char* key, float default_value = 0.0f) override;
|
|
||||||
|
|
||||||
bool RequestRenderWindowSize(s32 new_window_width, s32 new_window_height) override;
|
|
||||||
|
|
||||||
bool IsFullscreen() const override;
|
|
||||||
bool SetFullscreen(bool enabled) override;
|
|
||||||
|
|
||||||
void RunLater(std::function<void()> callback) override;
|
|
||||||
void ApplySettings(bool display_osd_messages) override;
|
|
||||||
|
|
||||||
void Run();
|
|
||||||
|
|
||||||
protected:
|
|
||||||
void LoadSettings() override;
|
|
||||||
|
|
||||||
bool AcquireHostDisplay() override;
|
|
||||||
void ReleaseHostDisplay() override;
|
|
||||||
|
|
||||||
void OnSystemCreated() override;
|
|
||||||
void OnSystemPaused(bool paused) override;
|
|
||||||
void OnSystemDestroyed() override;
|
|
||||||
void OnRunningGameChanged() override;
|
|
||||||
|
|
||||||
void RequestExit() override;
|
|
||||||
void PollAndUpdate() override;
|
|
||||||
|
|
||||||
std::optional<HostKeyCode> GetHostKeyCode(const std::string_view key_code) const override;
|
|
||||||
void UpdateInputMap() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool CreateSDLWindow();
|
|
||||||
void DestroySDLWindow();
|
|
||||||
bool CreateDisplay();
|
|
||||||
void DestroyDisplay();
|
|
||||||
void CreateImGuiContext();
|
|
||||||
void UpdateFramebufferScale();
|
|
||||||
|
|
||||||
void SaveAndUpdateSettings();
|
|
||||||
|
|
||||||
// We only pass mouse input through if it's grabbed
|
|
||||||
void DrawImGuiWindows() override;
|
|
||||||
void DoStartDisc();
|
|
||||||
void DoChangeDisc();
|
|
||||||
void DoDumpRAM();
|
|
||||||
|
|
||||||
void HandleSDLEvent(const SDL_Event* event);
|
|
||||||
void ProcessEvents();
|
|
||||||
|
|
||||||
void DrawMainMenuBar();
|
|
||||||
void DrawQuickSettingsMenu();
|
|
||||||
void DrawDebugMenu();
|
|
||||||
void DrawPoweredOffWindow();
|
|
||||||
void DrawSettingsWindow();
|
|
||||||
void DrawAboutWindow();
|
|
||||||
bool DrawFileChooser(const char* label, std::string* path, const char* filter = nullptr);
|
|
||||||
void ClearImGuiFocus();
|
|
||||||
|
|
||||||
SDL_Window* m_window = nullptr;
|
|
||||||
std::unique_ptr<HostDisplayTexture> m_app_icon_texture;
|
|
||||||
std::unique_ptr<INISettingsInterface> m_settings_interface;
|
|
||||||
u32 m_run_later_event_id = 0;
|
|
||||||
|
|
||||||
bool m_fullscreen = false;
|
|
||||||
bool m_quit_request = false;
|
|
||||||
bool m_settings_window_open = false;
|
|
||||||
bool m_about_window_open = false;
|
|
||||||
|
|
||||||
// this copy of the settings is modified by imgui
|
|
||||||
Settings m_settings_copy;
|
|
||||||
};
|
|
||||||
|
|
@ -1,353 +0,0 @@
|
||||||
#pragma once
|
|
||||||
#include "common/string.h"
|
|
||||||
#include "common/types.h"
|
|
||||||
#include <SDL.h>
|
|
||||||
#include <array>
|
|
||||||
#include <cstring>
|
|
||||||
#include <map>
|
|
||||||
#include <optional>
|
|
||||||
#include <string_view>
|
|
||||||
|
|
||||||
namespace SDLKeyNames {
|
|
||||||
|
|
||||||
static const std::map<int, const char*> s_sdl_key_names = {{SDLK_RETURN, "Return"},
|
|
||||||
{SDLK_ESCAPE, "Escape"},
|
|
||||||
{SDLK_BACKSPACE, "Backspace"},
|
|
||||||
{SDLK_TAB, "Tab"},
|
|
||||||
{SDLK_SPACE, "Space"},
|
|
||||||
{SDLK_EXCLAIM, "Exclam"},
|
|
||||||
{SDLK_QUOTEDBL, "QuoteDbl"},
|
|
||||||
{SDLK_HASH, "Hash"},
|
|
||||||
{SDLK_PERCENT, "Percent"},
|
|
||||||
{SDLK_DOLLAR, "Dollar"},
|
|
||||||
{SDLK_AMPERSAND, "Ampersand"},
|
|
||||||
{SDLK_QUOTE, "Apostrophe"},
|
|
||||||
{SDLK_LEFTPAREN, "ParenLeft"},
|
|
||||||
{SDLK_RIGHTPAREN, "ParenRight"},
|
|
||||||
{SDLK_ASTERISK, "Asterisk"},
|
|
||||||
{SDLK_PLUS, "PLus"},
|
|
||||||
{SDLK_COMMA, "Comma"},
|
|
||||||
{SDLK_MINUS, "Minus"},
|
|
||||||
{SDLK_PERIOD, "Period"},
|
|
||||||
{SDLK_SLASH, "Slash"},
|
|
||||||
{SDLK_0, "0"},
|
|
||||||
{SDLK_1, "1"},
|
|
||||||
{SDLK_2, "2"},
|
|
||||||
{SDLK_3, "3"},
|
|
||||||
{SDLK_4, "4"},
|
|
||||||
{SDLK_5, "5"},
|
|
||||||
{SDLK_6, "6"},
|
|
||||||
{SDLK_7, "7"},
|
|
||||||
{SDLK_8, "8"},
|
|
||||||
{SDLK_9, "9"},
|
|
||||||
{SDLK_COLON, "Colon"},
|
|
||||||
{SDLK_SEMICOLON, "Semcolon"},
|
|
||||||
{SDLK_LESS, "Less"},
|
|
||||||
{SDLK_EQUALS, "Equal"},
|
|
||||||
{SDLK_GREATER, "Greater"},
|
|
||||||
{SDLK_QUESTION, "Question"},
|
|
||||||
{SDLK_AT, "AT"},
|
|
||||||
{SDLK_LEFTBRACKET, "BracketLeft"},
|
|
||||||
{SDLK_BACKSLASH, "Backslash"},
|
|
||||||
{SDLK_RIGHTBRACKET, "BracketRight"},
|
|
||||||
{SDLK_CARET, "Caret"},
|
|
||||||
{SDLK_UNDERSCORE, "Underscore"},
|
|
||||||
{SDLK_BACKQUOTE, "Backquote"},
|
|
||||||
{SDLK_a, "A"},
|
|
||||||
{SDLK_b, "B"},
|
|
||||||
{SDLK_c, "C"},
|
|
||||||
{SDLK_d, "D"},
|
|
||||||
{SDLK_e, "E"},
|
|
||||||
{SDLK_f, "F"},
|
|
||||||
{SDLK_g, "G"},
|
|
||||||
{SDLK_h, "H"},
|
|
||||||
{SDLK_i, "I"},
|
|
||||||
{SDLK_j, "J"},
|
|
||||||
{SDLK_k, "K"},
|
|
||||||
{SDLK_l, "L"},
|
|
||||||
{SDLK_m, "M"},
|
|
||||||
{SDLK_n, "N"},
|
|
||||||
{SDLK_o, "O"},
|
|
||||||
{SDLK_p, "P"},
|
|
||||||
{SDLK_q, "Q"},
|
|
||||||
{SDLK_r, "R"},
|
|
||||||
{SDLK_s, "S"},
|
|
||||||
{SDLK_t, "T"},
|
|
||||||
{SDLK_u, "U"},
|
|
||||||
{SDLK_v, "V"},
|
|
||||||
{SDLK_w, "W"},
|
|
||||||
{SDLK_x, "X"},
|
|
||||||
{SDLK_y, "Y"},
|
|
||||||
{SDLK_z, "Z"},
|
|
||||||
{SDLK_CAPSLOCK, "CapsLock"},
|
|
||||||
{SDLK_F1, "F1"},
|
|
||||||
{SDLK_F2, "F2"},
|
|
||||||
{SDLK_F3, "F3"},
|
|
||||||
{SDLK_F4, "F4"},
|
|
||||||
{SDLK_F5, "F5"},
|
|
||||||
{SDLK_F6, "F6"},
|
|
||||||
{SDLK_F7, "F7"},
|
|
||||||
{SDLK_F8, "F8"},
|
|
||||||
{SDLK_F9, "F9"},
|
|
||||||
{SDLK_F10, "F10"},
|
|
||||||
{SDLK_F11, "F11"},
|
|
||||||
{SDLK_F12, "F12"},
|
|
||||||
{SDLK_PRINTSCREEN, "Print"},
|
|
||||||
{SDLK_SCROLLLOCK, "ScrollLock"},
|
|
||||||
{SDLK_PAUSE, "Pause"},
|
|
||||||
{SDLK_INSERT, "Insert"},
|
|
||||||
{SDLK_HOME, "Home"},
|
|
||||||
{SDLK_PAGEUP, "PageUp"},
|
|
||||||
{SDLK_DELETE, "Delete"},
|
|
||||||
{SDLK_END, "End"},
|
|
||||||
{SDLK_PAGEDOWN, "PageDown"},
|
|
||||||
{SDLK_RIGHT, "Right"},
|
|
||||||
{SDLK_LEFT, "Left"},
|
|
||||||
{SDLK_DOWN, "Down"},
|
|
||||||
{SDLK_UP, "Up"},
|
|
||||||
{SDLK_NUMLOCKCLEAR, "NumLock"},
|
|
||||||
{SDLK_KP_DIVIDE, "Keypad+Divide"},
|
|
||||||
{SDLK_KP_MULTIPLY, "Keypad+Multiply"},
|
|
||||||
{SDLK_KP_MINUS, "Keypad+Minus"},
|
|
||||||
{SDLK_KP_PLUS, "Keypad+Plus"},
|
|
||||||
{SDLK_KP_ENTER, "Keypad+Return"},
|
|
||||||
{SDLK_KP_1, "Keypad+1"},
|
|
||||||
{SDLK_KP_2, "Keypad+2"},
|
|
||||||
{SDLK_KP_3, "Keypad+3"},
|
|
||||||
{SDLK_KP_4, "Keypad+4"},
|
|
||||||
{SDLK_KP_5, "Keypad+5"},
|
|
||||||
{SDLK_KP_6, "Keypad+6"},
|
|
||||||
{SDLK_KP_7, "Keypad+7"},
|
|
||||||
{SDLK_KP_8, "Keypad+8"},
|
|
||||||
{SDLK_KP_9, "Keypad+9"},
|
|
||||||
{SDLK_KP_0, "Keypad+0"},
|
|
||||||
{SDLK_KP_PERIOD, "Keypad+Period"},
|
|
||||||
{SDLK_APPLICATION, "Application"},
|
|
||||||
{SDLK_POWER, "Power"},
|
|
||||||
{SDLK_KP_EQUALS, "Keypad+Equal"},
|
|
||||||
{SDLK_F13, "F13"},
|
|
||||||
{SDLK_F14, "F14"},
|
|
||||||
{SDLK_F15, "F15"},
|
|
||||||
{SDLK_F16, "F16"},
|
|
||||||
{SDLK_F17, "F17"},
|
|
||||||
{SDLK_F18, "F18"},
|
|
||||||
{SDLK_F19, "F19"},
|
|
||||||
{SDLK_F20, "F20"},
|
|
||||||
{SDLK_F21, "F21"},
|
|
||||||
{SDLK_F22, "F22"},
|
|
||||||
{SDLK_F23, "F23"},
|
|
||||||
{SDLK_F24, "F24"},
|
|
||||||
{SDLK_EXECUTE, "Execute"},
|
|
||||||
{SDLK_HELP, "Help"},
|
|
||||||
{SDLK_MENU, "Menu"},
|
|
||||||
{SDLK_SELECT, "Select"},
|
|
||||||
{SDLK_STOP, "Stop"},
|
|
||||||
{SDLK_AGAIN, "Again"},
|
|
||||||
{SDLK_UNDO, "Undo"},
|
|
||||||
{SDLK_CUT, "Cut"},
|
|
||||||
{SDLK_COPY, "Copy"},
|
|
||||||
{SDLK_PASTE, "Paste"},
|
|
||||||
{SDLK_FIND, "Find"},
|
|
||||||
{SDLK_MUTE, "Mute"},
|
|
||||||
{SDLK_VOLUMEUP, "VolumeUp"},
|
|
||||||
{SDLK_VOLUMEDOWN, "VolumeDown"},
|
|
||||||
{SDLK_KP_COMMA, "Keypad+Comma"},
|
|
||||||
{SDLK_KP_EQUALSAS400, "Keypad+EqualAS400"},
|
|
||||||
{SDLK_ALTERASE, "AltErase"},
|
|
||||||
{SDLK_SYSREQ, "SysReq"},
|
|
||||||
{SDLK_CANCEL, "Cancel"},
|
|
||||||
{SDLK_CLEAR, "Clear"},
|
|
||||||
{SDLK_PRIOR, "Prior"},
|
|
||||||
{SDLK_RETURN2, "Return2"},
|
|
||||||
{SDLK_SEPARATOR, "Separator"},
|
|
||||||
{SDLK_OUT, "Out"},
|
|
||||||
{SDLK_OPER, "Oper"},
|
|
||||||
{SDLK_CLEARAGAIN, "ClearAgain"},
|
|
||||||
{SDLK_CRSEL, "CrSel"},
|
|
||||||
{SDLK_EXSEL, "ExSel"},
|
|
||||||
{SDLK_KP_00, "Keypad+00"},
|
|
||||||
{SDLK_KP_000, "Keypad+000"},
|
|
||||||
{SDLK_THOUSANDSSEPARATOR, "ThousandsSeparator"},
|
|
||||||
{SDLK_DECIMALSEPARATOR, "DecimalSeparator"},
|
|
||||||
{SDLK_CURRENCYUNIT, "CurrencyUnit"},
|
|
||||||
{SDLK_CURRENCYSUBUNIT, "CurrencySubunit"},
|
|
||||||
{SDLK_KP_LEFTPAREN, "Keypad+ParenLeft"},
|
|
||||||
{SDLK_KP_RIGHTPAREN, "Keypad+ParenRight"},
|
|
||||||
{SDLK_KP_LEFTBRACE, "Keypad+LeftBrace"},
|
|
||||||
{SDLK_KP_RIGHTBRACE, "Keypad+RightBrace"},
|
|
||||||
{SDLK_KP_TAB, "Keypad+Tab"},
|
|
||||||
{SDLK_KP_BACKSPACE, "Keypad+Backspace"},
|
|
||||||
{SDLK_KP_A, "Keypad+A"},
|
|
||||||
{SDLK_KP_B, "Keypad+B"},
|
|
||||||
{SDLK_KP_C, "Keypad+C"},
|
|
||||||
{SDLK_KP_D, "Keypad+D"},
|
|
||||||
{SDLK_KP_E, "Keypad+E"},
|
|
||||||
{SDLK_KP_F, "Keypad+F"},
|
|
||||||
{SDLK_KP_XOR, "Keypad+XOR"},
|
|
||||||
{SDLK_KP_POWER, "Keypad+Power"},
|
|
||||||
{SDLK_KP_PERCENT, "Keypad+Percent"},
|
|
||||||
{SDLK_KP_LESS, "Keypad+Less"},
|
|
||||||
{SDLK_KP_GREATER, "Keypad+Greater"},
|
|
||||||
{SDLK_KP_AMPERSAND, "Keypad+Ampersand"},
|
|
||||||
{SDLK_KP_DBLAMPERSAND, "Keypad+AmpersandDbl"},
|
|
||||||
{SDLK_KP_VERTICALBAR, "Keypad+Bar"},
|
|
||||||
{SDLK_KP_DBLVERTICALBAR, "Keypad+BarDbl"},
|
|
||||||
{SDLK_KP_COLON, "Keypad+Colon"},
|
|
||||||
{SDLK_KP_HASH, "Keypad+Hash"},
|
|
||||||
{SDLK_KP_SPACE, "Keypad+Space"},
|
|
||||||
{SDLK_KP_AT, "Keypad+At"},
|
|
||||||
{SDLK_KP_EXCLAM, "Keypad+Exclam"},
|
|
||||||
{SDLK_KP_MEMSTORE, "Keypad+MemStore"},
|
|
||||||
{SDLK_KP_MEMRECALL, "Keypad+MemRecall"},
|
|
||||||
{SDLK_KP_MEMCLEAR, "Keypad+MemClear"},
|
|
||||||
{SDLK_KP_MEMADD, "Keypad+MemAdd"},
|
|
||||||
{SDLK_KP_MEMSUBTRACT, "Keypad+MemSubtract"},
|
|
||||||
{SDLK_KP_MEMMULTIPLY, "Keypad+MemMultiply"},
|
|
||||||
{SDLK_KP_MEMDIVIDE, "Keypad+MemDivide"},
|
|
||||||
{SDLK_KP_PLUSMINUS, "Keypad+PlusMinus"},
|
|
||||||
{SDLK_KP_CLEAR, "Keypad+Clear"},
|
|
||||||
{SDLK_KP_CLEARENTRY, "Keypad+ClearEntry"},
|
|
||||||
{SDLK_KP_BINARY, "Keypad+Binary"},
|
|
||||||
{SDLK_KP_OCTAL, "Keypad+Octal"},
|
|
||||||
{SDLK_KP_DECIMAL, "Keypad+Decimal"},
|
|
||||||
{SDLK_KP_HEXADECIMAL, "Keypad+Hexadecimal"},
|
|
||||||
{SDLK_LCTRL, "LeftControl"},
|
|
||||||
{SDLK_LSHIFT, "LeftShift"},
|
|
||||||
{SDLK_LALT, "LeftAlt"},
|
|
||||||
{SDLK_LGUI, "Super_L"},
|
|
||||||
{SDLK_RCTRL, "RightCtrl"},
|
|
||||||
{SDLK_RSHIFT, "RightShift"},
|
|
||||||
{SDLK_RALT, "RightAlt"},
|
|
||||||
{SDLK_RGUI, "RightSuper"},
|
|
||||||
{SDLK_MODE, "Mode"},
|
|
||||||
{SDLK_AUDIONEXT, "MediaNext"},
|
|
||||||
{SDLK_AUDIOPREV, "MediaPrevious"},
|
|
||||||
{SDLK_AUDIOSTOP, "MediaStop"},
|
|
||||||
{SDLK_AUDIOPLAY, "MediaPlay"},
|
|
||||||
{SDLK_AUDIOMUTE, "VolumeMute"},
|
|
||||||
{SDLK_MEDIASELECT, "MediaSelect"},
|
|
||||||
{SDLK_WWW, "WWW"},
|
|
||||||
{SDLK_MAIL, "Mail"},
|
|
||||||
{SDLK_CALCULATOR, "Calculator"},
|
|
||||||
{SDLK_COMPUTER, "Computer"},
|
|
||||||
{SDLK_AC_SEARCH, "Search"},
|
|
||||||
{SDLK_AC_HOME, "Home"},
|
|
||||||
{SDLK_AC_BACK, "Back"},
|
|
||||||
{SDLK_AC_FORWARD, "Forward"},
|
|
||||||
{SDLK_AC_STOP, "Stop"},
|
|
||||||
{SDLK_AC_REFRESH, "Refresh"},
|
|
||||||
{SDLK_AC_BOOKMARKS, "Bookmarks"},
|
|
||||||
{SDLK_BRIGHTNESSDOWN, "BrightnessDown"},
|
|
||||||
{SDLK_BRIGHTNESSUP, "BrightnessUp"},
|
|
||||||
{SDLK_DISPLAYSWITCH, "DisplaySwitch"},
|
|
||||||
{SDLK_KBDILLUMTOGGLE, "IllumToggle"},
|
|
||||||
{SDLK_KBDILLUMDOWN, "IllumDown"},
|
|
||||||
{SDLK_KBDILLUMUP, "IllumUp"},
|
|
||||||
{SDLK_EJECT, "Eject"},
|
|
||||||
{SDLK_SLEEP, "Sleep"},
|
|
||||||
{SDLK_APP1, "App1"},
|
|
||||||
{SDLK_APP2, "App2"},
|
|
||||||
{SDLK_AUDIOREWIND, "MediaRewind"},
|
|
||||||
{SDLK_AUDIOFASTFORWARD, "MediaFastForward"}};
|
|
||||||
|
|
||||||
struct SDLKeyModifierEntry
|
|
||||||
{
|
|
||||||
SDL_Keymod mod;
|
|
||||||
SDL_Keymod mod_mask;
|
|
||||||
SDL_Keycode key_left;
|
|
||||||
SDL_Keycode key_right;
|
|
||||||
const char* name;
|
|
||||||
};
|
|
||||||
|
|
||||||
static const std::array<SDLKeyModifierEntry, 4> s_sdl_key_modifiers = {
|
|
||||||
{{KMOD_LSHIFT, static_cast<SDL_Keymod>(KMOD_LSHIFT | KMOD_RSHIFT), SDLK_LSHIFT, SDLK_RSHIFT, "Shift"},
|
|
||||||
{KMOD_LCTRL, static_cast<SDL_Keymod>(KMOD_LCTRL | KMOD_LCTRL), SDLK_LCTRL, SDLK_RCTRL, "Control"},
|
|
||||||
{KMOD_LALT, static_cast<SDL_Keymod>(KMOD_LALT | KMOD_RALT), SDLK_LALT, SDLK_RALT, "Alt"},
|
|
||||||
{KMOD_LGUI, static_cast<SDL_Keymod>(KMOD_LGUI | KMOD_RGUI), SDLK_LGUI, SDLK_RGUI, "Meta"}}};
|
|
||||||
|
|
||||||
const char* GetKeyName(SDL_Keycode key)
|
|
||||||
{
|
|
||||||
const auto it = s_sdl_key_names.find(key);
|
|
||||||
return it == s_sdl_key_names.end() ? nullptr : it->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::optional<SDL_Keycode> GetKeyCodeForName(const std::string_view key_name)
|
|
||||||
{
|
|
||||||
for (const auto& it : s_sdl_key_names)
|
|
||||||
{
|
|
||||||
if (key_name == it.second)
|
|
||||||
return it.first;
|
|
||||||
}
|
|
||||||
|
|
||||||
return std::nullopt;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 KeyEventToInt(const SDL_Event* event)
|
|
||||||
{
|
|
||||||
u32 code = static_cast<u32>(event->key.keysym.sym);
|
|
||||||
|
|
||||||
const SDL_Keymod mods = static_cast<SDL_Keymod>(event->key.keysym.mod);
|
|
||||||
if (mods & (KMOD_LSHIFT | KMOD_RSHIFT))
|
|
||||||
code |= static_cast<u32>(KMOD_LSHIFT) << 16;
|
|
||||||
if (mods & (KMOD_LCTRL | KMOD_RCTRL))
|
|
||||||
code |= static_cast<u32>(KMOD_LCTRL) << 16;
|
|
||||||
if (mods & (KMOD_LALT | KMOD_RALT))
|
|
||||||
code |= static_cast<u32>(KMOD_LALT) << 16;
|
|
||||||
if (mods & (KMOD_LGUI | KMOD_RGUI))
|
|
||||||
code |= static_cast<u32>(KMOD_LGUI) << 16;
|
|
||||||
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool KeyEventToString(const SDL_Event* event, String& out_string)
|
|
||||||
{
|
|
||||||
const SDL_Keycode key = event->key.keysym.sym;
|
|
||||||
const SDL_Keymod mods = static_cast<SDL_Keymod>(event->key.keysym.mod);
|
|
||||||
const char* key_name = GetKeyName(event->key.keysym.sym);
|
|
||||||
if (!key_name)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
out_string.Clear();
|
|
||||||
|
|
||||||
for (const SDLKeyModifierEntry& mod : s_sdl_key_modifiers)
|
|
||||||
{
|
|
||||||
if (mods & mod.mod_mask && key != mod.key_left && key != mod.key_right)
|
|
||||||
{
|
|
||||||
out_string.AppendString(mod.name);
|
|
||||||
out_string.AppendCharacter('+');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
out_string.AppendString(key_name);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::optional<u32> ParseKeyString(const std::string_view key_str)
|
|
||||||
{
|
|
||||||
u32 modifiers = 0;
|
|
||||||
std::string_view::size_type pos = 0;
|
|
||||||
for (;;)
|
|
||||||
{
|
|
||||||
std::string_view::size_type plus_pos = key_str.find('+', pos);
|
|
||||||
if (plus_pos == std::string_view::npos)
|
|
||||||
break;
|
|
||||||
|
|
||||||
const std::string_view mod_part = key_str.substr(pos, plus_pos - pos);
|
|
||||||
for (const SDLKeyModifierEntry& mod : s_sdl_key_modifiers)
|
|
||||||
{
|
|
||||||
if (mod_part == mod.name)
|
|
||||||
{
|
|
||||||
modifiers |= static_cast<int>(mod.mod);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pos = plus_pos + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::optional<SDL_Keycode> key_code = GetKeyCodeForName(key_str.substr(pos));
|
|
||||||
if (!key_code)
|
|
||||||
return std::nullopt;
|
|
||||||
|
|
||||||
return static_cast<u32>(key_code.value()) | (modifiers << 16);
|
|
||||||
}
|
|
||||||
} // namespace SDLKeyNames
|
|
||||||
|
|
@ -1,107 +0,0 @@
|
||||||
#include "sdl_util.h"
|
|
||||||
#include "common/log.h"
|
|
||||||
#include <SDL_syswm.h>
|
|
||||||
Log_SetChannel(SDLUtil);
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <objc/message.h>
|
|
||||||
struct NSView;
|
|
||||||
|
|
||||||
static NSView* GetContentViewFromWindow(NSWindow* window)
|
|
||||||
{
|
|
||||||
// window.contentView
|
|
||||||
return reinterpret_cast<NSView* (*)(id, SEL)>(objc_msgSend)(reinterpret_cast<id>(window), sel_getUid("contentView"));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace SDLUtil {
|
|
||||||
|
|
||||||
std::optional<WindowInfo> GetWindowInfoForSDLWindow(SDL_Window* window)
|
|
||||||
{
|
|
||||||
SDL_SysWMinfo syswm = {};
|
|
||||||
SDL_VERSION(&syswm.version);
|
|
||||||
if (!SDL_GetWindowWMInfo(window, &syswm))
|
|
||||||
{
|
|
||||||
Log_ErrorPrintf("SDL_GetWindowWMInfo failed");
|
|
||||||
return std::nullopt;
|
|
||||||
}
|
|
||||||
|
|
||||||
int window_width, window_height;
|
|
||||||
SDL_GetWindowSize(window, &window_width, &window_height);
|
|
||||||
|
|
||||||
WindowInfo wi;
|
|
||||||
wi.surface_width = static_cast<u32>(window_width);
|
|
||||||
wi.surface_height = static_cast<u32>(window_height);
|
|
||||||
wi.surface_scale = GetDPIScaleFactor(window);
|
|
||||||
wi.surface_format = WindowInfo::SurfaceFormat::RGB8;
|
|
||||||
|
|
||||||
switch (syswm.subsystem)
|
|
||||||
{
|
|
||||||
#ifdef SDL_VIDEO_DRIVER_WINDOWS
|
|
||||||
case SDL_SYSWM_WINDOWS:
|
|
||||||
wi.type = WindowInfo::Type::Win32;
|
|
||||||
wi.window_handle = syswm.info.win.window;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SDL_VIDEO_DRIVER_COCOA
|
|
||||||
case SDL_SYSWM_COCOA:
|
|
||||||
wi.type = WindowInfo::Type::MacOS;
|
|
||||||
wi.window_handle = GetContentViewFromWindow(syswm.info.cocoa.window);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SDL_VIDEO_DRIVER_X11
|
|
||||||
case SDL_SYSWM_X11:
|
|
||||||
wi.type = WindowInfo::Type::X11;
|
|
||||||
wi.window_handle = reinterpret_cast<void*>(static_cast<uintptr_t>(syswm.info.x11.window));
|
|
||||||
wi.display_connection = syswm.info.x11.display;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SDL_VIDEO_DRIVER_WAYLAND
|
|
||||||
case SDL_SYSWM_WAYLAND:
|
|
||||||
wi.type = WindowInfo::Type::Wayland;
|
|
||||||
wi.window_handle = syswm.info.wl.surface;
|
|
||||||
wi.display_connection = syswm.info.wl.display;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
default:
|
|
||||||
Log_ErrorPrintf("Unhandled syswm subsystem %u", static_cast<u32>(syswm.subsystem));
|
|
||||||
return std::nullopt;
|
|
||||||
}
|
|
||||||
|
|
||||||
return wi;
|
|
||||||
}
|
|
||||||
|
|
||||||
float GetDPIScaleFactor(SDL_Window* window)
|
|
||||||
{
|
|
||||||
#ifdef __APPLE__
|
|
||||||
static constexpr float DEFAULT_DPI = 72.0f;
|
|
||||||
#else
|
|
||||||
static constexpr float DEFAULT_DPI = 96.0f;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!window)
|
|
||||||
{
|
|
||||||
SDL_Window* dummy_window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1, 1,
|
|
||||||
SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_HIDDEN);
|
|
||||||
if (!dummy_window)
|
|
||||||
return 1.0f;
|
|
||||||
|
|
||||||
const float scale = GetDPIScaleFactor(dummy_window);
|
|
||||||
|
|
||||||
SDL_DestroyWindow(dummy_window);
|
|
||||||
|
|
||||||
return scale;
|
|
||||||
}
|
|
||||||
|
|
||||||
int display_index = SDL_GetWindowDisplayIndex(window);
|
|
||||||
float display_dpi = DEFAULT_DPI;
|
|
||||||
if (SDL_GetDisplayDPI(display_index, &display_dpi, nullptr, nullptr) != 0)
|
|
||||||
return 1.0f;
|
|
||||||
|
|
||||||
return display_dpi / DEFAULT_DPI;
|
|
||||||
}
|
|
||||||
} // namespace SDLUtil
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
#pragma once
|
|
||||||
#include "common/types.h"
|
|
||||||
#include "common/window_info.h"
|
|
||||||
#include <optional>
|
|
||||||
|
|
||||||
struct SDL_Window;
|
|
||||||
|
|
||||||
namespace SDLUtil {
|
|
||||||
std::optional<WindowInfo> GetWindowInfoForSDLWindow(SDL_Window* window);
|
|
||||||
float GetDPIScaleFactor(SDL_Window* window);
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue