From c8700dd24684d04fc253a04265caa5a41a4ef394 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Tue, 26 Apr 2022 00:15:27 +0200
Subject: [PATCH] Input: log interception and its source function

---
 rpcs3/Emu/Cell/Modules/cellOskDialog.cpp |  2 +-
 rpcs3/Emu/Io/interception.cpp            | 10 +++++++---
 rpcs3/Emu/Io/interception.h              |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
index 554c2c0e5c..b7f32f4361 100644
--- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
@@ -768,7 +768,7 @@ error_code cellOskDialogSetSeparateWindowOption(vm::ptr<CellOskDialogSeparateWin
 	// inputFieldLayoutInfo;
 	// inputPanelLayoutInfo;
 
-	cellOskDialog.warning("cellOskDialogSetSeparateWindowOption: continuousMode=%s)", osk.osk_continuous_mode.load());
+	cellOskDialog.warning("cellOskDialogSetSeparateWindowOption: use_separate_windows=true, continuous_mode=%s, device_mask=0x%x)", osk.osk_continuous_mode.load(), osk.device_mask.load());
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Io/interception.cpp b/rpcs3/Emu/Io/interception.cpp
index b260ff239a..eb0141fdf4 100644
--- a/rpcs3/Emu/Io/interception.cpp
+++ b/rpcs3/Emu/Io/interception.cpp
@@ -5,14 +5,18 @@
 #include "Input/pad_thread.h"
 #include "Emu/IdManager.h"
 
+LOG_CHANNEL(input_log, "Input");
+
 namespace input
 {
 	atomic_t<bool> g_pads_intercepted{false};
 	atomic_t<bool> g_keyboards_intercepted{false};
 	atomic_t<bool> g_mice_intercepted{false};
 
-	void SetIntercepted(bool pads_intercepted, bool keyboards_intercepted, bool mice_intercepted)
+	void SetIntercepted(bool pads_intercepted, bool keyboards_intercepted, bool mice_intercepted, const char* func)
 	{
+		input_log.warning("SetIntercepted: pads=%d, keyboards=%d, mice=%d, src=%s)", pads_intercepted, keyboards_intercepted, mice_intercepted, func);
+
 		g_pads_intercepted = pads_intercepted;
 		g_keyboards_intercepted = keyboards_intercepted;
 		g_mice_intercepted = mice_intercepted;
@@ -30,8 +34,8 @@ namespace input
 		}
 	}
 
-	void SetIntercepted(bool all_intercepted)
+	void SetIntercepted(bool all_intercepted, const char* func)
 	{
-		SetIntercepted(all_intercepted, all_intercepted, all_intercepted);
+		SetIntercepted(all_intercepted, all_intercepted, all_intercepted, func);
 	}
 }
diff --git a/rpcs3/Emu/Io/interception.h b/rpcs3/Emu/Io/interception.h
index 8e07f7f7ab..e5653b96ec 100644
--- a/rpcs3/Emu/Io/interception.h
+++ b/rpcs3/Emu/Io/interception.h
@@ -8,6 +8,6 @@ namespace input
 	extern atomic_t<bool> g_keyboards_intercepted;
 	extern atomic_t<bool> g_mice_intercepted;
 
-	void SetIntercepted(bool pads_intercepted, bool keyboards_intercepted, bool mice_intercepted);
-	void SetIntercepted(bool all_intercepted);
+	void SetIntercepted(bool pads_intercepted, bool keyboards_intercepted, bool mice_intercepted, const char* func = __builtin_FUNCTION());
+	void SetIntercepted(bool all_intercepted, const char* func = __builtin_FUNCTION());
 }