diff --git a/main.cpp b/main.cpp index 28b94e66f..47c5fdbd7 100644 --- a/main.cpp +++ b/main.cpp @@ -3,6 +3,7 @@ #include #include #include "imgui.h" +#include "imgui_impl_android.h" #include "imgui_impl_opengl3.h" #include "dobby.h" #include @@ -10,196 +11,130 @@ #define LOG_TAG "AndKitty_Menu" #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) -#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__) // --- 全局状态 --- static bool g_Initialized = false; static bool g_ShowMenu = true; static float g_Width = 0, g_Height = 0; -struct TouchState { +// 存储触摸数据 +struct { float x, y; bool down; - int frameCounter; -} g_Touch = {0, 0, false, 0}; +} g_Touch = {0, 0, false}; // --- 原函数指针 --- typedef int32_t (*p_getPointerId)(const AInputEvent* motion_event, size_t pointer_index); static p_getPointerId old_getPointerId = nullptr; -typedef float (*p_getRawX)(const AInputEvent* motion_event, size_t pointer_index); -static p_getRawX old_getRawX = nullptr; - -typedef float (*p_getRawY)(const AInputEvent* motion_event, size_t pointer_index); -static p_getRawY old_getRawY = nullptr; - typedef EGLBoolean (*p_eglSwapBuffers)(EGLDisplay dpy, EGLSurface surface); static p_eglSwapBuffers old_eglSwapBuffers = nullptr; -// --------------------------------------------------------------------- -// 实时更新坐标和触摸状态 -// --------------------------------------------------------------------- -static void UpdateTouchFromEvent(const AInputEvent* event, size_t pointer_index) { - if (!event || AInputEvent_getType(event) != AINPUT_EVENT_TYPE_MOTION) - return; - - int32_t action = AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK; - // 只跟踪第一个手指（通常菜单只需单点） - if (pointer_index == 0) { - if (action == AMOTION_EVENT_ACTION_DOWN || action == AMOTION_EVENT_ACTION_POINTER_DOWN) { - g_Touch.down = true; - } else if (action == AMOTION_EVENT_ACTION_UP || action == AMOTION_EVENT_ACTION_POINTER_UP || - action == AMOTION_EVENT_ACTION_CANCEL) { - g_Touch.down = false; +// --- 【GitHub 常用方案】直接从 PointerId 入手 --- +int32_t hook_getPointerId(const AInputEvent* event, size_t index) { + if (g_ShowMenu && event != nullptr) { + int type = AInputEvent_getType(event); + if (type == AINPUT_EVENT_TYPE_MOTION) { + int action = AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK; + + // 获取手指 0 的位置 + float rawX = AMotionEvent_getX(event, 0); + float rawY = AMotionEvent_getY(event, 0); + + // 只有当坐标有效时才更新，防止跳动 + if (rawX >= 0 && rawY >= 0) { + g_Touch.x = rawX; + g_Touch.y = rawY; + + if (action == AMOTION_EVENT_ACTION_DOWN || action == AMOTION_EVENT_ACTION_POINTER_DOWN) { + g_Touch.down = true; + } else if (action == AMOTION_EVENT_ACTION_UP || action == AMOTION_EVENT_ACTION_POINTER_UP || action == AMOTION_EVENT_ACTION_CANCEL) { + g_Touch.down = false; + } + } + + // 如果菜单显示，且触摸在菜单范围内，你可以选择性拦截 (此处暂不拦截以保证游戏操作) } } + return old_getPointerId(event, index); } -float hook_getRawX(const AInputEvent* event, size_t index) { - if (event && old_getRawX) { - float x = old_getRawX(event, index); - g_Touch.x = x; - UpdateTouchFromEvent(event, index); - return x; - } - return 0.0f; -} - -float hook_getRawY(const AInputEvent* event, size_t index) { - if (event && old_getRawY) { - float y = old_getRawY(event, index); - g_Touch.y = y; - UpdateTouchFromEvent(event, index); - return y; - } - return 0.0f; -} - -int32_t hook_getPointerId(const AInputEvent* event, size_t index) { - return old_getPointerId ? old_getPointerId(event, index) : 0; -} - -// --------------------------------------------------------------------- -// 渲染 Hook -// --------------------------------------------------------------------- +// --- 渲染逻辑 --- EGLBoolean hook_eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) { - if (g_Width <= 0 || g_Height <= 0) { + if (g_Width <= 0) { EGLint w, h; eglQuerySurface(dpy, surface, EGL_WIDTH, &w); eglQuerySurface(dpy, surface, EGL_HEIGHT, &h); - g_Width = (float)w; - g_Height = (float)h; - LOGI("Screen size: %.0f x %.0f", g_Width, g_Height); + g_Width = (float)w; g_Height = (float)h; } if (!g_Initialized) { ImGui::CreateContext(); ImGui_ImplOpenGL3_Init("#version 300 es"); - // 移除不兼容的样式设置（TouchPadding 和 ScaleAllSizes） + + // 样式适配 + ImGui::StyleColorsDark(); + ImGui::GetStyle().ScaleAllSizes(3.0f); + g_Initialized = true; - LOGI("ImGui initialized"); + LOGI("ImGui Context Ready. Resolution: %.fx%.f", g_Width, g_Height); } ImGui_ImplOpenGL3_NewFrame(); ImGui::NewFrame(); - ImGuiIO& io = ImGui::GetIO(); - io.DisplaySize = ImVec2(g_Width, g_Height); - io.MousePos = ImVec2(g_Touch.x, g_Touch.y); - io.MouseDown[0] = g_Touch.down; - - if (g_Touch.frameCounter++ % 120 == 0) { - LOGI("Touch: (%.1f, %.1f) down=%d", g_Touch.x, g_Touch.y, g_Touch.down); - } - if (g_ShowMenu) { - ImGui::SetNextWindowSize(ImVec2(500, 400), ImGuiCond_FirstUseEver); - ImGui::SetNextWindowPos(ImVec2(50, 50), ImGuiCond_FirstUseEver); - if (ImGui::Begin("AndKitty SGame Final", &g_ShowMenu)) { - ImGui::Text("Status: Input Hooked (RawX/Y)"); - ImGui::Text("Touch Pos: %.1f, %.1f", g_Touch.x, g_Touch.y); - ImGui::Text("Touch State: %s", g_Touch.down ? "DOWN" : "UP"); + ImGuiIO& io = ImGui::GetIO(); + io.DisplaySize = ImVec2(g_Width, g_Height); + + // 【核心】将 Hook 到的坐标精准同步给 ImGui + io.MousePos = ImVec2(g_Touch.x, g_Touch.y); + io.MouseDown[0] = g_Touch.down; + + ImGui::SetNextWindowSize(ImVec2(600, 400), ImGuiCond_FirstUseEver); + if (ImGui::Begin("AndKitty SGame Stable", &g_ShowMenu)) { + ImGui::Text("Github Strategy: PointerId Monitoring"); ImGui::Separator(); - - static bool testFlag = false; - ImGui::Checkbox("Function Test", &testFlag); - - if (ImGui::Button("Hide Menu")) { - g_ShowMenu = false; - LOGI("Menu hidden by button"); - } - } - ImGui::End(); - } else { - // 小窗口用于重新显示菜单 - ImGui::SetNextWindowSize(ImVec2(100, 50), ImGuiCond_Always); - ImGui::SetNextWindowPos(ImVec2(10, 10), ImGuiCond_Always); - if (ImGui::Begin("Menu Controller", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize)) { - if (ImGui::Button("Show Menu")) { - g_ShowMenu = true; - LOGI("Menu shown by button"); - } + + ImGui::Text("MousePos: %.1f, %.1f", io.MousePos.x, io.MousePos.y); + ImGui::Text("IsDown: %s", io.MouseDown[0] ? "True" : "False"); + + ImGui::Separator(); + static float menu_alpha = 0.8f; + ImGui::SliderFloat("Menu Alpha", &menu_alpha, 0.1f, 1.0f); + + if (ImGui::Button("Close Menu")) g_ShowMenu = false; } ImGui::End(); } ImGui::Render(); ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); - return old_eglSwapBuffers(dpy, surface); } -// --------------------------------------------------------------------- -// 初始化线程 -// --------------------------------------------------------------------- void* init_thread(void*) { - LOGI("Init thread started"); - - void* eglFunc = dlsym(RTLD_DEFAULT, "eglSwapBuffers"); - if (eglFunc) { - DobbyHook(eglFunc, (void*)hook_eglSwapBuffers, (void**)&old_eglSwapBuffers); - LOGI("Hooked eglSwapBuffers at %p", eglFunc); - } else { - LOGE("Failed to find eglSwapBuffers"); - } + LOGI("Applying Stable Input Hooks..."); + + // 渲染 + void* egl = dlsym(RTLD_DEFAULT, "eglSwapBuffers"); + if (egl) DobbyHook(egl, (void*)hook_eglSwapBuffers, (void**)&old_eglSwapBuffers); + // 输入: 参考 GitHub 方案，锁定 libandroid.so 中的 AMotionEvent_getPointerId void* libandroid = dlopen("libandroid.so", RTLD_NOW); if (libandroid) { void* getPointerId = dlsym(libandroid, "AMotionEvent_getPointerId"); - void* getRawX = dlsym(libandroid, "AMotionEvent_getRawX"); - void* getRawY = dlsym(libandroid, "AMotionEvent_getRawY"); - - if (!getRawX) getRawX = dlsym(libandroid, "AMotionEvent_getX"); - if (!getRawY) getRawY = dlsym(libandroid, "AMotionEvent_getY"); - - if (getRawX) { - DobbyHook(getRawX, (void*)hook_getRawX, (void**)&old_getRawX); - LOGI("Hooked getRawX at %p", getRawX); - } else { - LOGE("Cannot find getX/getRawX"); - } - if (getRawY) { - DobbyHook(getRawY, (void*)hook_getRawY, (void**)&old_getRawY); - LOGI("Hooked getRawY at %p", getRawY); - } else { - LOGE("Cannot find getY/getRawY"); - } if (getPointerId) { DobbyHook(getPointerId, (void*)hook_getPointerId, (void**)&old_getPointerId); - LOGI("Hooked getPointerId at %p", getPointerId); + LOGI("Input Monitoring Active via PointerId"); } - // 注意：不要 dlclose(libandroid)，避免地址失效 - } else { - LOGE("Failed to load libandroid.so"); } - LOGI("Init thread finished"); return nullptr; } __attribute__((constructor)) void entry() { - pthread_t thread; - pthread_create(&thread, nullptr, init_thread, nullptr); - pthread_detach(thread); + pthread_t t; + pthread_create(&t, nullptr, init_thread, nullptr); }