Merge branch 'program_override'

yeshjho · Jan 1, 2024 · 2fecafd · 2fecafd
2 parents d6a9d34 + 4d02446
commit 2fecafd
Show file tree

Hide file tree

Showing 25 changed files with 1,282 additions and 706 deletions.
diff --git a/Typoon/Typoon.vcxproj b/Typoon/Typoon.vcxproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <ClCompile Include="imm\imm_simulator.cpp" />
     <ClCompile Include="input_multicast\input_multicast.cpp" />
+    <ClCompile Include="match\trigger_trees_per_program.cpp" />
     <ClCompile Include="parse\parse_keys.cpp" />
     <ClCompile Include="platform\windows\clipboard.cpp" />
     <ClCompile Include="platform\windows\command.cpp" />
@@ -27,6 +28,7 @@
     <ClCompile Include="platform\windows\file_change_watcher.cpp" />
     <ClCompile Include="platform\windows\input_watcher.cpp" />
     <ClCompile Include="platform\windows\main.cpp" />
+    <ClCompile Include="platform\windows\window_focus.cpp" />
     <ClCompile Include="platform\windows\wnd_proc.cpp" />
     <ClCompile Include="utils\config.cpp" />
     <ClCompile Include="utils\logger.cpp" />
@@ -44,8 +46,10 @@
     <ClInclude Include="low_level\hotkey.h" />
     <ClInclude Include="low_level\input_watcher.h" />
     <ClInclude Include="low_level\tray_icon.h" />
+    <ClInclude Include="low_level\window_focus.h" />
     <ClInclude Include="match\match.h" />
     <ClInclude Include="match\trigger_tree.h" />
+    <ClInclude Include="match\trigger_trees_per_program.h" />
     <ClInclude Include="parse\parse_keys.h" />
     <ClInclude Include="parse\parse_match.h" />
     <ClInclude Include="platform\windows\log.h" />

diff --git a/Typoon/Typoon.vcxproj.filters b/Typoon/Typoon.vcxproj.filters
@@ -75,6 +75,12 @@
     <ClCompile Include="platform\windows\command.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="platform\windows\window_focus.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="match\trigger_trees_per_program.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="utils\logger.h">
@@ -143,6 +149,12 @@
     <ClInclude Include="low_level\command.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="low_level\window_focus.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="match\trigger_trees_per_program.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Typoon.rc">

diff --git a/Typoon/low_level/hotkey.h b/Typoon/low_level/hotkey.h
@@ -138,6 +138,7 @@ enum class [[nodiscard]] EModifierKey : unsigned int
 enum class [[nodiscard]] EHotKeyType
 {
     TOGGLE_ON_OFF,
+    GET_PROGRAM_NAME,
 };
 
 

diff --git a/Typoon/low_level/window_focus.h b/Typoon/low_level/window_focus.h
@@ -0,0 +1,8 @@
+#pragma once
+#include <any>
+#include <optional>
+#include <string>
+
+
+std::optional<std::wstring> get_current_focus_program_name(const std::any& data = {});
+void check_for_window_focus_change(const std::any& data = {});
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,6 +138,7 @@ enum class [[nodiscard]] EModifierKey : unsigned int @@
     enum class [[nodiscard]] EHotKeyType
     {
         TOGGLE_ON_OFF,
+        GET_PROGRAM_NAME,
     };
@@ Expand Down @@