InputSystem: add reversed KeyInfo_t and KeyEvent_t struct

Almost fully mapped out, the unknown fields seem to be unused or padding.

src/core/init.cpp

@@ -96,14 +96,15 @@
 #include "engine/sys_utils.h"
 #ifndef DEDICATED
 #include "engine/sys_getmodes.h"
-#include "engine/gl_rmain.h"
 #include "engine/sys_mainwind.h"
 #include "engine/matsys_interface.h"
+#include "engine/gl_rmain.h"
 #include "engine/gl_matsysiface.h"
 #include "engine/gl_drawlights.h"
 #include "engine/gl_screen.h"
 #include "engine/gl_rsurf.h"
 #include "engine/debugoverlay.h"
+#include "engine/keys.h"
 #endif // !DEDICATED
 #include "vscript/languages/squirrel_re/include/squirrel.h"
 #include "vscript/languages/squirrel_re/include/sqvm.h"
@@ -593,6 +594,7 @@ void DetourRegister() // Register detour classes to be searched and hooked.
 	REGISTER(VGL_RSurf);
 
 	REGISTER(VDebugOverlay); // !TODO: This also needs to be exposed to server dll!!!
+	REGISTER(VKeys);
 #endif // !DEDICATED
 
 	// VScript

src/engine/CMakeLists.txt

@@ -26,6 +26,11 @@ add_sources( SOURCE_GROUP "Debug"
     "debugoverlay.h"
 )
 
+add_sources( SOURCE_GROUP "Input"
+    "keys.cpp"
+    "keys.h"
+)
+
 add_sources( SOURCE_GROUP "Render"
     "framelimit.cpp"
     "framelimit.h"
@@ -189,6 +194,7 @@ add_sources( SOURCE_GROUP "Common"
     "${ENGINE_SOURCE_DIR}/common/qlimits.h"
     "${ENGINE_SOURCE_DIR}/common/sdkdefs.h"
     "${ENGINE_SOURCE_DIR}/common/x86defs.h"
+    "${ENGINE_SOURCE_DIR}/common/xbox/xboxstubs.h"
 )
 
 file( GLOB ENGINE_PUBLIC_HEADERS

src/engine/keys.cpp

@@ -0,0 +1,5 @@
+#include "keys.h"
+
+KeyInfo_t* g_pKeyInfo = nullptr;
+ButtonCode_t* g_pKeyEventTicks = nullptr;
+short* g_nKeyEventCount = nullptr;

src/engine/keys.h

@@ -0,0 +1,72 @@
+#ifndef ENGINE_KEYS_H
+#define ENGINE_KEYS_H
+#include "inputsystem/ButtonCode.h"
+
+//-----------------------------------------------------------------------------
+// Keypress event
+//-----------------------------------------------------------------------------
+struct KeyEvent_t
+{
+	const char* m_pCommand;
+	int m_nTick;
+	bool m_bDown;
+};
+
+//-----------------------------------------------------------------------------
+// Current keypress state
+//-----------------------------------------------------------------------------
+struct KeyInfo_t
+{
+	enum
+	{
+		KEY_TAPPED_BIND = 0,
+		KEY_HELD_BIND,
+
+		KEY_BIND_COUNT
+	};
+
+	const char* m_pKeyBinding[KEY_BIND_COUNT];
+	int m_nKeyUpTarget;
+	int m_nKeyDownTarget;
+
+	uint32_t m_nEventTick; // When was the event issued?
+	int unknown;
+	short m_nEventNumber; // The event number.
+
+	bool m_bKeyDown;
+	bool m_bEventIsButtonKey; // Is the event a button key (< ButtonCode_t::KEY_LAST)
+	bool m_bBoundKeyDown;
+	bool m_bBoundSecondKey; // Is the key bound to the second row?
+
+	short paddingMaybe;
+};
+
+extern KeyInfo_t* g_pKeyInfo;          // ARRAYSIZE = ButtonCode_t::BUTTON_CODE_LAST
+extern ButtonCode_t* g_pKeyEventTicks; // ARRAYSIZE = ButtonCode_t::BUTTON_CODE_LAST
+extern short* g_nKeyEventCount;
+
+class VKeys : public IDetour
+{
+	virtual void GetAdr(void) const
+	{
+		LogVarAdr("g_pKeyInfo", reinterpret_cast<uintptr_t>(g_pKeyInfo));
+		LogVarAdr("g_pKeyEventTicks", reinterpret_cast<uintptr_t>(g_pKeyEventTicks));
+		LogVarAdr("g_nKeyEventCount", reinterpret_cast<uintptr_t>(g_nKeyEventCount));
+	}
+	virtual void GetFun(void) const { }
+	virtual void GetVar(void) const
+	{
+		g_pKeyInfo = g_GameDll.FindPatternSIMD("48 83 EC 28 33 D2 48 8D 0D ?? ?? ?? ?? 41 B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 33 C0 C6 05 ?? ?? ?? ?? ??")
+			.FindPatternSelf("48 8D 0D", CMemory::Direction::DOWN, 40).ResolveRelativeAddressSelf(3, 7).RCast<KeyInfo_t*>();
+
+		CMemory l_EngineApi_PumpMessages = g_GameDll.FindPatternSIMD("48 89 5C 24 ?? 55 48 81 EC ?? ?? ?? ?? 45 33 C9");
+
+		// NOTE: g_nKeyEventCount's pattern is found earlier, thus searched for earlier to offset base for g_pKeyEventTicks.
+		g_nKeyEventCount = l_EngineApi_PumpMessages.FindPatternSelf("0F B7 15").ResolveRelativeAddressSelf(3, 7).RCast<short*>();
+		g_pKeyEventTicks = l_EngineApi_PumpMessages.FindPatternSelf("48 8D 35").ResolveRelativeAddressSelf(3, 7).RCast<ButtonCode_t*>();
+	}
+	virtual void GetCon(void) const { }
+	virtual void Detour(const bool bAttach) const { }
+};
+
+#endif // ENGINE_KEYS_H