fix(input): 优化输入事件钩子的安装和处理逻辑

- 将输入钩子安装方法由 InstallHooks 改名为 InstallInputHooks
- 新增对 libinput.so 中多个消费输入事件函数的钩子支持
- 修改触摸事件钩子回调为 OnConsumeSamples，增强事件处理
- 根据是否初始化，通过事件指针对 ImGuiImplAndroid 进行输入事件处理
- 统一更新 VulkanRenderer 和 EGLRenderer 中的输入钩子安装调用代码

Author: StArray

.github/workflows/build.yml

@@ -43,41 +43,41 @@ jobs:
           name: library-release.aar
           path: Android/library/build/outputs/aar/library-release.aar
 
-  # ──── Windows Native + .NET DLL (cross-compiled on Linux) ────
+  # ──── Windows Native + .NET DLL ────
   windows:
     name: Windows
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Install MinGW cross-compiler
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            gcc-mingw-w64-x86-64 \
-            g++-mingw-w64-x86-64 \
-            mingw-w64-tools \
-            cmake \
-            ninja-build
+      - name: Set up MSYS2 (MinGW)
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          update: true
+          install: >-
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-toolchain
 
       - name: Set up .NET 10
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '10.0.x'
 
-      - name: Build Native (CMake + MinGW cross)
+      - name: Build Native (CMake + MinGW)
+        shell: msys2 {0}
         run: |
           cd StArray.ModManager.Windows/Native
-          # Generate cimgui import lib from pre-built DLL
-          x86_64-w64-mingw32-gendef - ../dlls/cimgui.dll > cimgui.def
-          x86_64-w64-mingw32-dlltool -d cimgui.def -l libcimgui.a -D ../dlls/cimgui.dll
-          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \
-            -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ \
-            -DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres
+          # Generate cimgui import lib from DLL
+          gendef - ../dlls/cimgui.dll > cimgui.def
+          dlltool -d cimgui.def -l libcimgui.a -D ../dlls/cimgui.dll
+          cmake -B build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release
           cmake --build build
 
       - name: Build C#
@@ -90,13 +90,13 @@ jobs:
           mkdir -p "$dst"
           cp -r "$src"/* "$dst/"
           rm -rf "$dst/runtimes"
-          cd "$dst" && zip -r ../windows-dll.zip . && cd ..
+          tar -czf windows-dll.tar.gz -C "$dst" .
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
           name: windows-dll
-          path: windows-dll.zip
+          path: windows-dll.tar.gz
 
   # ──── Android .NET DLL ────
   android-dll:

Scripts/push_and_run.sh

@@ -3,8 +3,11 @@ PATH=$PATH:/d/AndroidSDK/platform-tools
 dotnet build --no-restore
 adb push StArray.ModManager/bin/Debug/net10.0/StArray.ModManager.dll $TARGET_PATH/StArray.ModManager.dll
 adb push StArray.ModManager/bin/Debug/net10.0/StArray.ModManager.pdb $TARGET_PATH/StArray.ModManager.pdb
+
+adb push LevelDebugger/bin/Debug/net10.0/LevelDebugger.dll $TARGET_PATH/../mods/LevelDebugger/LevelDebugger.dll
+
 adb push StArray.ModManager.Android/bin/Debug/net10.0/StArray.ModManager.Android.dll $TARGET_PATH/StArray.ModManager.Android.dll
-adb push StArray.ModManager.Android/bin/Debug/net10.0/StArray.ModManager.Android.pdb $TARGET_PATH/StArray.ModManager.Android.pdb
+#adb push StArray.ModManager.Android/bin/Debug/net10.0/StArray.ModManager.Android.pdb $TARGET_PATH/StArray.ModManager.Android.pdb
 adb shell am force-stop starray.adofai.v3
 adb shell am start starray.adofai.v3/starray.adofai.v3.MainActivity
 adb logcat -c

StArray.ModManager.Android/UI/ImGuiEGLRender.cs

@@ -159,7 +159,7 @@ private void InitImGui(IntPtr display, IntPtr surface)
         ((IImGuiRenderer)this).InitImGui();
         ImGuiInputHandler.IsInitialized = true;
         // 输入 Hook 委托给静态处理器
-        ImGuiInputHandler.InstallHooks();
+        ImGuiInputHandler.InstallInputHooks();
         var io = ImGui.GetIO();
         io.ConfigFlags |= ImGuiConfigFlags.NavEnableKeyboard;
         io.FontGlobalScale = 3.0f;

StArray.ModManager.Android/UI/ImGuiInputHandler.cs

@@ -2,35 +2,26 @@
 using System.Runtime.InteropServices;
 using ImGuiNET;
 using StArray.ModManager.Android.Native;
+using StArray.ModManager.Hooks;
 using StArray.ModManager.Manager;
 
 namespace StArray.ModManager.Android.UI;
 
 /// <summary>ImGui input handler / 输入处理器 — touch/key hooks + IME control</summary>
-public static class ImGuiInputHandler
+public static partial class ImGuiInputHandler
 {
     /// <summary>ImGui 上下文就绪后由渲染器设置</summary>
     public static bool IsInitialized { get; set; }
-
-    private static InitializeMotionEventDelegate s_initializeMotionEvent;
-
-    private delegate int InitializeMotionEventDelegate(IntPtr self, IntPtr motionEvent, IntPtr message);
+    
 
     private static bool s_wantTextInputLast;
 
     /// <summary>
     /// 安装触摸事件和按键事件 Hook
     /// </summary>
-    public static void InstallHooks()
+    public static void InstallInputHooks()
     {
-        // —— 触摸事件 Hook ——
-        string consumerSymbol = "_ZN7android13InputConsumer21initializeMotionEventEPNS_11MotionEventEPKNS_12InputMessageE";
-        IntPtr consumerAddr = Dobby.SymbolResolver("libinput.so", consumerSymbol);
-        Dobby.Hook(consumerAddr,
-            typeof(ImGuiInputHandler).GetMethod(nameof(OnTouchEvent))!.MethodHandle.GetFunctionPointer(),
-            out var origin);
-        s_initializeMotionEvent = Marshal.GetDelegateForFunctionPointer<InitializeMotionEventDelegate>(origin);
-
+        InstallHooks();
         // IME 字符回调：Java nativeSendChar → C → 此回调 → ImGui
         NativeFunctions.SetOnAcceptCharCallback(codepoint =>
         {
@@ -55,12 +46,20 @@ public static void InstallHooks()
     }
 
     /// <summary>触摸事件 Hook 回调</summary>
-    [UnmanagedCallersOnly(CallConvs = [typeof(CallConvCdecl)])]
-    public static int OnTouchEvent(IntPtr self, IntPtr motionEvent, IntPtr message)
+    [NativeHook("libinput.so","_ZN7android13InputConsumer14consumeSamplesEPNS_26InputEventFactoryInterfaceERNS0_5BatchEmPjPPNS_10InputEventE")]
+    public unsafe static long OnConsumeSamples(void* thiz,void* factory, IntPtr batch,
+        ulong count, uint* outSeq, void** outEvent)
+    {
+        var result = OnConsumeSamplesOriginal(thiz,factory, batch, count, outSeq, outEvent);
+        if (IsInitialized && *outEvent != null) ImGuiImplAndroid.HandleInputEvent(new IntPtr(*outEvent));
+        return result;
+    }
+    
+    [NativeHook("libinput.so","_ZN7android13InputConsumer7consumeEPNS_26InputEventFactoryInterfaceEblPjPPNS_10InputEventE")]
+    public unsafe static long OnConsume(void* thiz, void* factory, bool consumeBatches, ulong frameTime, uint* outSeq, void** outEvent)
     {
-        int result = s_initializeMotionEvent(self, motionEvent, message);
-        if (IsInitialized)
-            ImGuiImplAndroid.HandleInputEvent(self);
+        var result = OnConsumeOriginal(thiz, factory, consumeBatches, frameTime, outSeq, outEvent);
+        if (IsInitialized && *outEvent != null) ImGuiImplAndroid.HandleInputEvent(new IntPtr(*outEvent));
         return result;
     }
 

StArray.ModManager.Android/UI/ImGuiVulkanRenderer.cs

@@ -221,7 +221,7 @@ private bool InstallInstance()
             Marshal.GetDelegateForFunctionPointer<VkQueuePresentKHRDelegate>(origPresent);
 
         // 输入 Hook
-        ImGuiInputHandler.InstallHooks();
+        ImGuiInputHandler.InstallInputHooks();
 
         // 回放缓存的静态事件订阅
         if (s_pendingOnRender != null)