refactor: EffectsService 和 LocalizationService 移到 Magpie.Core

Author: Blinue

src/Magpie/EffectsService.cpp src/Magpie.Core/EffectsService.cppsrc/Magpie/EffectsService.cpp renamed to src/Magpie.Core/EffectsService.cpp

@@ -59,7 +59,7 @@ winrt::fire_and_forget EffectsService::Initialize() {
 			CommonSharedConstants::EFFECTS_DIR, L"\\", effectNames[id], L".hlsl");
 		std::string source;
 		Win32Helper::ReadTextFile(fileName.c_str(), source);
-		EffectInfo2 effectInfo;
+		EffectInfo effectInfo;
 		std::string errorMsg = ShaderEffectParser::ParseForInfo(
 			StrHelper::UTF16ToUTF8(effectNames[id]), std::move(source), effectInfo);
 		if (!errorMsg.empty()) {
@@ -80,12 +80,12 @@ void EffectsService::Uninitialize() {
 	_WaitForInitialize();
 }
 
-const std::vector<EffectInfo2>& EffectsService::GetEffects() noexcept {
+const std::vector<EffectInfo>& EffectsService::GetEffects() noexcept {
 	_WaitForInitialize();
 	return _effects;
 }
 
-const EffectInfo2* EffectsService::GetEffect(std::wstring_view name) noexcept {
+const EffectInfo* EffectsService::GetEffect(std::wstring_view name) noexcept {
 	_WaitForInitialize();
 
 	auto it = _effectsMap.find(name);

src/Magpie/LocalizationService.cpp src/Magpie.Core/LocalizationService.cppsrc/Magpie/LocalizationService.cpp renamed to src/Magpie.Core/LocalizationService.cpp

@@ -1,15 +1,13 @@
 #include "pch.h"
-#include "AppSettings.h"
 #include "LocalizationService.h"
+#include "CommonSharedConstants.h"
 #include <bcp47mrm.h>
 #include <winrt/Windows.System.UserProfile.h>
 
-using namespace winrt;
-
 namespace Magpie {
 
 // 标签必须为小写
-static std::array SUPPORTED_LANGUAGES{
+static std::array SUPPORTED_LANGUAGES = {
 	L"de",
 	L"en-us",
 	L"es",
@@ -32,7 +30,7 @@ static std::array SUPPORTED_LANGUAGES{
 void LocalizationService::EarlyInitialize() {
 	// 非打包应用默认使用“Windows 显示语言”，这里自行切换至“首选语言”
 	std::wstring userLanguages;
-	for (const hstring& language : UserProfile::GlobalizationPreferences::Languages()) {
+	for (const winrt::hstring& language : winrt::UserProfile::GlobalizationPreferences::Languages()) {
 		userLanguages += language;
 		userLanguages += L'\0';
 	}
@@ -62,22 +60,26 @@ void LocalizationService::EarlyInitialize() {
 	_Language(bestLanguage);
 }
 
-void LocalizationService::Initialize() {
-	AppSettings& settings = AppSettings::Get();
-
-	int language = settings.Language();
+void LocalizationService::Initialize(int language) {
 	if (language >= 0) {
 		_Language(SUPPORTED_LANGUAGES[language]);
 	}
+
+	_resourceLoader = winrt::ResourceLoader::GetForViewIndependentUse(
+		CommonSharedConstants::APP_RESOURCE_MAP_ID);
 }
 
-std::span<const wchar_t*> LocalizationService::SupportedLanguages() noexcept {
+std::span<const wchar_t*> LocalizationService::GetSupportedLanguages() noexcept {
 	return SUPPORTED_LANGUAGES;
 }
 
+winrt::hstring LocalizationService::GetLocalizedString(std::wstring_view resName) const noexcept {
+	return _resourceLoader.GetString(resName);
+}
+
 void LocalizationService::_Language(const wchar_t* tag) {
 	_language = tag;
-	ResourceContext::SetGlobalQualifierValue(L"Language", tag);
+	winrt::ResourceContext::SetGlobalQualifierValue(L"Language", tag);
 }
 
 }

src/Magpie.Core/Magpie.Core.vcxproj

@@ -66,6 +66,8 @@
     <ClInclude Include="FrameProducer.h" />
     <ClInclude Include="CursorHelper.h" />
     <ClInclude Include="include\EffectInfo.h" />
+    <ClInclude Include="include\EffectsService.h" />
+    <ClInclude Include="include\LocalizationService.h" />
     <ClInclude Include="include\ShaderEffectParser.h" />
     <ClInclude Include="ShaderEffectCompilerService.h" />
     <ClInclude Include="ShaderEffectDesc.h" />
@@ -99,9 +101,11 @@
     <ClCompile Include="DuplicateFrameChecker.cpp" />
     <ClCompile Include="DescriptorHeap.cpp" />
     <ClCompile Include="EffectsDrawer.cpp" />
+    <ClCompile Include="EffectsService.cpp" />
     <ClCompile Include="ExclModeHelper.cpp" />
     <ClCompile Include="FrameProducer.cpp" />
     <ClCompile Include="CursorHelper.cpp" />
+    <ClCompile Include="LocalizationService.cpp" />
     <ClCompile Include="ShaderEffectCompilerService.cpp" />
     <ClCompile Include="ShaderEffectDrawer.cpp" />
     <ClCompile Include="GraphicsCaptureFrameSource.cpp" />

src/Magpie.Core/Magpie.Core.vcxproj.filters

@@ -94,7 +94,6 @@
     <ClInclude Include="DuplicateFrameChecker.h">
       <Filter>Capture</Filter>
     </ClInclude>
-    <ClInclude Include="RectHelper.h" />
     <ClInclude Include="DirtyRectsOptimizer.h">
       <Filter>Capture</Filter>
     </ClInclude>
@@ -129,6 +128,15 @@
       <Filter>Render</Filter>
     </ClInclude>
     <ClInclude Include="Renderer.h" />
+    <ClInclude Include="RectHelper.h">
+      <Filter>Helpers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\EffectsService.h">
+      <Filter>Include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\LocalizationService.h">
+      <Filter>Include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ScalingRuntime.cpp" />
@@ -199,6 +207,12 @@
       <Filter>Render</Filter>
     </ClCompile>
     <ClCompile Include="Renderer.cpp" />
+    <ClCompile Include="LocalizationService.cpp">
+      <Filter>Services</Filter>
+    </ClCompile>
+    <ClCompile Include="EffectsService.cpp">
+      <Filter>Services</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="shaders\MaskedCursorPS.hlsl">
@@ -240,10 +254,12 @@
     <FxCompile Include="shaders\CursorResizerPS.hlsl">
       <Filter>Shaders</Filter>
     </FxCompile>
-    <FxCompile Include="shaders\TextureBlitPS.hlsl" />
     <FxCompile Include="shaders\FullscreenVS.hlsl">
       <Filter>Shaders</Filter>
     </FxCompile>
+    <FxCompile Include="shaders\TextureBlitPS.hlsl">
+      <Filter>Shaders</Filter>
+    </FxCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/Magpie.Core/ScalingWindow.cpp

@@ -19,21 +19,11 @@ static UINT WM_MAGPIE_SCALINGCHANGED;
 // 窗口模式缩放时缩放窗口应遮挡源窗口和它的阴影，在四周留出 50 x DPI 缩放的空间
 static constexpr int WINDOWED_MODE_MIN_SPACE_AROUND = 2 * 50;
 
-static void InitMessage() noexcept {
-	[[maybe_unused]] static Ignore _ = []() {
-		WM_MAGPIE_SCALINGCHANGED =
-			RegisterWindowMessage(CommonSharedConstants::WM_MAGPIE_SCALINGCHANGED);
-
-		return Ignore();
-	}();
-}
-
 static bool IsTopmostWindow(HWND hWnd) noexcept {
 	return GetWindowExStyle(hWnd) & WS_EX_TOPMOST;
 }
 
-ScalingWindow::ScalingWindow() noexcept :
-	_resourceLoader(winrt::ResourceLoader::GetForViewIndependentUse(CommonSharedConstants::APP_RESOURCE_MAP_ID)) {}
+ScalingWindow::ScalingWindow() noexcept {}
 
 ScalingWindow::~ScalingWindow() noexcept {}
 
@@ -93,8 +83,6 @@ ScalingError ScalingWindow::_StartImpl(HWND hwndSrc) noexcept {
 		return ScalingError::ScalingFailedGeneral;
 	}
 
-	InitMessage();
-
 	bool isSrcInvisibleOrMinimized = false;
 	if (ScalingError error = _srcTracker.Set(hwndSrc, _options, isSrcInvisibleOrMinimized);
 		error != ScalingError::NoError
@@ -120,7 +108,10 @@ ScalingError ScalingWindow::_StartImpl(HWND hwndSrc) noexcept {
 	}
 
 	[[maybe_unused]] static Ignore _ = []() {
-		WNDCLASSEXW wcex{
+		WM_MAGPIE_SCALINGCHANGED =
+			RegisterWindowMessage(CommonSharedConstants::WM_MAGPIE_SCALINGCHANGED);
+
+		WNDCLASSEXW wcex = {
 			.cbSize = sizeof(wcex),
 			.lpfnWndProc = _WndProc,
 			.hInstance = wil::GetModuleInstanceHandle(),
@@ -462,10 +453,6 @@ void ScalingWindow::CleanAfterSrcRepositioned() noexcept {
 	_isSrcRepositioning = false;
 }
 
-winrt::hstring ScalingWindow::GetLocalizedString(std::wstring_view resName) const {
-	return _resourceLoader.GetString(resName);
-}
-
 LRESULT ScalingWindow::_MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) noexcept {
 	switch (msg) {
 	case WM_CREATE:

src/Magpie.Core/ScalingWindow.h

@@ -66,8 +66,6 @@ class ScalingWindow final : public WindowBaseT<ScalingWindow> {
 
 	void CleanAfterSrcRepositioned() noexcept;
 
-	winrt::hstring GetLocalizedString(std::wstring_view resName) const;
-
 	void ShowToast(std::wstring_view msg) const noexcept {
 		_options.showToast(Handle(), msg);
 	}
@@ -162,8 +160,6 @@ class ScalingWindow final : public WindowBaseT<ScalingWindow> {
 
 	class SrcTracker _srcTracker;
 
-	winrt::ResourceLoader _resourceLoader{ nullptr };
-
 	wil::unique_mutex_nothrow _exclModeMutex;
 
 	std::array<wil::unique_hwnd, 4> _hwndResizeHelpers{};

src/Magpie.Core/ShaderEffectParser.cpp

@@ -393,7 +393,7 @@ static bool ResolveHeaderSortName(
 		return false;
 	}
 
-	((EffectInfo2*)data)->sortName = sortName;
+	((EffectInfo*)data)->sortName = sortName;
 	return true;
 }
 
@@ -418,9 +418,9 @@ static bool ResolveHeaderCapability(
 
 	static constexpr std::array FLAG_INFOS = {
 		// 以下为必需
-		std::make_pair("FP16", EffectInfoFlags2::SupportFP16),
+		std::make_pair("FP16", EffectInfoFlags::SupportFP16),
 		// 以下为可选
-		std::make_pair("ADVANCEDCOLOR", EffectInfoFlags2::SupportAdvancedColor)
+		std::make_pair("ADVANCEDCOLOR", EffectInfoFlags::SupportAdvancedColor)
 	};
 
 	std::bitset<FLAG_INFOS.size()> processed;
@@ -440,7 +440,7 @@ static bool ResolveHeaderCapability(
 			}
 			processed[idx] = true;
 
-			((EffectInfo2*)data)->flags |= it->second;
+			((EffectInfo*)data)->flags |= it->second;
 		} else {
 			Logger::Get().Warn(StrHelper::Concat("使用了未知 CAPABILITY 标志: ", token));
 		}
@@ -454,7 +454,7 @@ static bool ResolveHeaderScaleFactor(
 	ParserState& state,
 	void* data
 ) noexcept {
-	if (!GetNextNumber(source, state, ((EffectInfo2*)data)->scaleFactor)) {
+	if (!GetNextNumber(source, state, ((EffectInfo*)data)->scaleFactor)) {
 		return false;
 	}
 
@@ -468,7 +468,7 @@ static bool ResolveHeaderScaleFactor(
 static bool ResolveHeader(
 	std::string_view source,
 	uint32_t startLineNumer,
-	EffectInfo2& effectInfo
+	EffectInfo& effectInfo
 ) noexcept {
 	static constexpr std::array COMMAND_INFOS = {
 		CommandInfo{ "VERSION", ResolveHeaderVersion, true },
@@ -653,7 +653,7 @@ static bool ResolveParameter(
 std::string ShaderEffectParser::ParseForInfo(
 	std::string&& name,
 	std::string&& source,
-	EffectInfo2& effectInfo
+	EffectInfo& effectInfo
 ) noexcept {
 	assert(!name.empty() && !source.empty());
 
@@ -671,7 +671,7 @@ std::string ShaderEffectParser::ParseForInfo(
 	std::string_view sourceView(source);
 
 	if (!CheckMagic(sourceView, state)) {
-		Logger::Get().Error("检查 MagpieFX 头失败");
+		Logger::Get().Error(StrHelper::Concat("CheckMagic 失败\n\t错误消息: ", state.errorMsg));
 		return std::move(state.errorMsg);
 	}
 
@@ -775,14 +775,14 @@ std::string ShaderEffectParser::ParseForInfo(
 	completeCurrentBlock(BlockType::Header, sourceView.size(), std::numeric_limits<size_t>::max());
 
 	if (!ResolveHeader(headerBlock.source, headerBlock.startLineNumer, effectInfo)) {
-		Logger::Get().Error(StrHelper::Concat("解析 Header 块失败: ", state.errorMsg));
+		Logger::Get().Error(StrHelper::Concat("ResolveHeader 失败\n\t错误消息: ", state.errorMsg));
 		return std::move(state.errorMsg);
 	}
 
 	effectInfo.params.resize(paramBlocks.size());
 	for (size_t i = 0; i < paramBlocks.size(); ++i) {
 		if (!ResolveParameter(paramBlocks[i].source, paramBlocks[i].startLineNumer, effectInfo.params[i])) {
-			Logger::Get().Error(fmt::format("解析 Parameter#{} 块失败", i + 1));
+			Logger::Get().Error(fmt::format("ResolveParameter#{} 失败\n\t错误消息: ", state.errorMsg));
 			return std::move(state.errorMsg);
 		}
 	}

src/Magpie.Core/include/EffectInfo.h

@@ -12,20 +12,20 @@ struct EffectInfoParameter {
 	float step;
 };
 
-enum class EffectInfoFlags2 {
+enum class EffectInfoFlags {
 	None,
 	SupportFP16 = 1,
 	SupportAdvancedColor = 1 << 1,
 };
-DEFINE_ENUM_FLAG_OPERATORS(EffectInfoFlags2)
+DEFINE_ENUM_FLAG_OPERATORS(EffectInfoFlags)
 
-struct EffectInfo2 {
+struct EffectInfo {
 	std::string name;
 	std::string sortName;
 	std::vector<EffectInfoParameter> params;
 	// 0 表示可以自由缩放
 	uint32_t scaleFactor = 0;
-	EffectInfoFlags2 flags = EffectInfoFlags2::None;
+	EffectInfoFlags flags = EffectInfoFlags::None;
 };
 
 }

src/Magpie/EffectsService.h src/Magpie.Core/include/EffectsService.hsrc/Magpie/EffectsService.h renamed to src/Magpie.Core/include/EffectsService.h

@@ -18,17 +18,17 @@ class EffectsService {
 
 	void Uninitialize();
 
-	const std::vector<EffectInfo2>& GetEffects() noexcept;
+	const std::vector<EffectInfo>& GetEffects() noexcept;
 
 	// 由于 WinUI 使用 UTF-16，这里也以 UTF-16 作为参数以减少编码转换
-	const EffectInfo2* GetEffect(std::wstring_view name) noexcept;
+	const EffectInfo* GetEffect(std::wstring_view name) noexcept;
 
 private:
 	EffectsService() = default;
 
 	void _WaitForInitialize() noexcept;
 
-	std::vector<EffectInfo2> _effects;
+	std::vector<EffectInfo> _effects;
 	phmap::flat_hash_map<std::wstring, uint32_t> _effectsMap;
 	std::atomic<bool> _initialized = false;
 	bool _initializedCache = false;

src/Magpie/LocalizationService.h …agpie.Core/include/LocalizationService.hsrc/Magpie/LocalizationService.h renamed to src/Magpie.Core/include/LocalizationService.h src/Magpie/LocalizationService.h renamed to src/Magpie.Core/include/LocalizationService.h

@@ -15,21 +15,25 @@ class LocalizationService {
 	// 在初始化 AppSettings 前调用以使用系统默认语言，然后就可以从 AppSettings 里读取语言设置
 	void EarlyInitialize();
 
-	void Initialize();
+	// -1 表示使用系统设置
+	void Initialize(int language);
 
 	// 支持的所有语言的标签，均为小写
-	static std::span<const wchar_t* > SupportedLanguages() noexcept;
+	static std::span<const wchar_t*> GetSupportedLanguages() noexcept;
 
-	const wchar_t* Language() const noexcept {
+	const wchar_t* GetLanguage() const noexcept {
 		return _language;
 	}
 
+	winrt::hstring GetLocalizedString(std::wstring_view resName) const noexcept;
+
 private:
 	LocalizationService() = default;
 
 	void _Language(const wchar_t* tag);
 
 	const wchar_t* _language = nullptr;
+	winrt::ResourceLoader _resourceLoader{ nullptr };
 };
 
 }