From dc6013cf0e19a66f489178da2235d2468fbb0186 Mon Sep 17 00:00:00 2001
From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com>
Date: Tue, 2 Dec 2025 09:41:06 +0100
Subject: [PATCH] Block normal mouse inputs in mouse-to-touchpad mode shadow
 sniped my PR. :(

---
 src/input/input_handler.cpp |  3 +++
 src/input/input_mouse.cpp   | 19 +++++++++++++++++++
 src/input/input_mouse.h     |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/src/input/input_handler.cpp b/src/input/input_handler.cpp
index 01c6d1fa4..e74569737 100644
--- a/src/input/input_handler.cpp
+++ b/src/input/input_handler.cpp
@@ -777,6 +777,9 @@ void ActivateOutputsFromInputs() {
         it.ResetUpdate();
     }
 
+    // Check for input blockers
+    ApplyMouseInputBlockers();
+
     // Iterate over all inputs, and update their respecive outputs accordingly
     for (auto& it : connections) {
         it.output->AddUpdate(it.ProcessBinding());
diff --git a/src/input/input_mouse.cpp b/src/input/input_mouse.cpp
index 55489283c..cead87e53 100644
--- a/src/input/input_mouse.cpp
+++ b/src/input/input_mouse.cpp
@@ -6,6 +6,7 @@
 #include "common/assert.h"
 #include "common/types.h"
 #include "input/controller.h"
+#include "input/input_handler.h"
 #include "input_mouse.h"
 
 #include <common/singleton.h>
@@ -16,6 +17,8 @@ extern Frontend::WindowSDL* g_window;
 
 namespace Input {
 
+extern std::list<std::pair<InputEvent, bool>> pressed_keys;
+
 int mouse_joystick_binding = 0;
 float mouse_deadzone_offset = 0.5, mouse_speed = 1, mouse_speed_offset = 0.1250;
 bool mouse_gyro_roll_mode = false;
@@ -105,6 +108,22 @@ void EmulateTouchpad(GameController* controller, u32 interval) {
                             (mouse_buttons & SDL_BUTTON_RMASK) != 0);
 }
 
+void ApplyMouseInputBlockers() {
+    switch (mouse_mode) {
+    case MouseMode::Touchpad:
+        LOG_INFO(Input, "Blocking mouse inputs");
+        for (auto& k : pressed_keys) {
+            if (k.first.input.sdl_id == SDL_BUTTON_LEFT ||
+                k.first.input.sdl_id == SDL_BUTTON_RIGHT) {
+                k.second = true;
+            }
+        }
+        break;
+    default:
+        break;
+    }
+}
+
 Uint32 MousePolling(void* param, Uint32 id, Uint32 interval) {
     auto* controller = (GameController*)param;
     switch (mouse_mode) {
diff --git a/src/input/input_mouse.h b/src/input/input_mouse.h
index 995f836f2..da1d874ec 100644
--- a/src/input/input_mouse.h
+++ b/src/input/input_mouse.h
@@ -23,6 +23,8 @@ void SetMouseGyroRollMode(bool mode);
 void EmulateJoystick(GameController* controller, u32 interval);
 void EmulateGyro(GameController* controller, u32 interval);
 
+void ApplyMouseInputBlockers();
+
 // Polls the mouse for changes
 Uint32 MousePolling(void* param, Uint32 id, Uint32 interval);