From 84d72cd1103abffc7f9fb3e97b85aee877c280f1 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 27 Feb 2025 20:12:07 +0800
Subject: [PATCH] Use project to implement Windows global hotkey

https://github.com/2dust/GlobalHotKeys
---
 .gitmodules                                    | 3 +++
 v2rayN/Directory.Packages.props                | 7 +++----
 v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs | 1 -
 v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj    | 2 +-
 v2rayN/v2rayN.sln                              | 6 ++++++
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..0ab249d5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "v2rayN/GlobalHotKeys"]
+	path = v2rayN/GlobalHotKeys
+	url = https://github.com/2dust/GlobalHotKeys
diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index 77930319..da2e149e 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -9,9 +9,8 @@
     <PackageVersion Include="Avalonia.Desktop" Version="11.2.4" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.4" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.4" />
-    <PackageVersion Include="CliWrap" Version="3.8.0" />
+    <PackageVersion Include="CliWrap" Version="3.8.1" />
     <PackageVersion Include="Downloader" Version="3.3.3" />
-    <PackageVersion Include="GlobalHotKeys.Windows" Version="0.1.0" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
@@ -23,9 +22,9 @@
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
     <PackageVersion Include="Splat.NLog" Version="15.3.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="TaskScheduler" Version="2.11.0" />
+    <PackageVersion Include="TaskScheduler" Version="2.12.0" />
     <PackageVersion Include="WebDav.Client" Version="2.8.0" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs b/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs
index 285bf442..43fdea7f 100644
--- a/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs
+++ b/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs
@@ -3,7 +3,6 @@ using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using Avalonia.Win32.Input;
 using GlobalHotKeys;
-using GlobalHotKeys.Native.Types;
 
 namespace v2rayN.Desktop.Handler
 {
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
index 5a550837..e488c63a 100644
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -26,12 +26,12 @@
 		<PackageReference Include="ReactiveUI.Fody">
 			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-        <PackageReference Include="GlobalHotKeys.Windows" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectCapability Include="Avalonia" />
 		<AvaloniaResource Include="Assets\**" />
+		<ProjectReference Include="..\GlobalHotKeys\src\GlobalHotKeys\GlobalHotKeys.csproj" />
 		<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
 	</ItemGroup>
 
diff --git a/v2rayN/v2rayN.sln b/v2rayN/v2rayN.sln
index 22a2bcce..3af7081a 100644
--- a/v2rayN/v2rayN.sln
+++ b/v2rayN/v2rayN.sln
@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "v2rayN.Desktop", "v2rayN.De
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AmazTool", "AmazTool\AmazTool.csproj", "{47D68B1C-601C-4C69-873B-FFF0DC13EC97}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlobalHotKeys", "GlobalHotKeys\src\GlobalHotKeys\GlobalHotKeys.csproj", "{CB3DE54F-3A26-AE02-1299-311132C32156}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB3DE54F-3A26-AE02-1299-311132C32156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB3DE54F-3A26-AE02-1299-311132C32156}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB3DE54F-3A26-AE02-1299-311132C32156}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB3DE54F-3A26-AE02-1299-311132C32156}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE