new windows workaround

changelog.md

@@ -4,6 +4,8 @@
 
 - port to 2.206 (thank you mat for Windows offsets)
 
+Note: Windows 2.206 currently has some new compatibility issues (for example, with custom keybinds)
+
 ## v1.1.0
 
 - initial Windows support

src/async.cpp

@@ -1,4 +1,5 @@
 #include "async.hpp"
+#include "main.hpp"
 
 #define DEBUG_PROCESSING false
 
@@ -12,6 +13,8 @@ void AsyncUILayer::handleKeypress(cocos2d::enumKeyCodes key, bool down) {
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 
 	UILayer::handleKeypress(key, down);
+	static_cast<CustomGJBaseGameLayer*>(this->m_gameLayer)->fixUntimedInputs();
+
 	m_fields->m_lastTimestamp = 0ull;
 }
 
@@ -24,6 +27,8 @@ bool AsyncUILayer::ccTouchBegan(cocos2d::CCTouch* touch, cocos2d::CCEvent* event
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 
 	auto r = UILayer::ccTouchBegan(touch, event);
+	static_cast<CustomGJBaseGameLayer*>(this->m_gameLayer)->fixUntimedInputs();
+
 	m_fields->m_lastTimestamp = 0ull;
 
 	return r;
@@ -54,6 +59,7 @@ void AsyncUILayer::ccTouchMoved(cocos2d::CCTouch* touch, cocos2d::CCEvent* event
 	}
 #else
 	UILayer::ccTouchMoved(touch, event);
+	static_cast<CustomGJBaseGameLayer*>(this->m_gameLayer)->fixUntimedInputs();
 #endif
 
 	m_fields->m_lastTimestamp = 0ull;
@@ -68,6 +74,8 @@ void AsyncUILayer::ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* event
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 
 	UILayer::ccTouchEnded(touch, event);
+	static_cast<CustomGJBaseGameLayer*>(this->m_gameLayer)->fixUntimedInputs();
+
 	m_fields->m_lastTimestamp = 0ull;
 }
 

src/main.cpp

@@ -157,5 +157,15 @@ void CustomGJBaseGameLayer::processCommands(float timeStep) {
 	GJBaseGameLayer::processCommands(timeStep);
 }
 
-// TODO: need a new Windows workaround for 2.206
+void CustomGJBaseGameLayer::fixUntimedInputs() {
+#ifdef GEODE_IS_WINDOWS
+	// windows workaround as queueButton and its vector insert is supposedly inlined everywhere!!
+	// as long as this is called before the timestamp is cleared, it should work
+	for (const auto& btn : this->m_queuedButtons) {
+		this->queueButton(static_cast<int>(btn.m_button), btn.m_isPush, btn.m_isPlayer2);
+	}
+
+	this->m_queuedButtons.clear();
+#endif
+}
 

src/main.hpp

@@ -25,6 +25,9 @@ struct CustomGJBaseGameLayer : geode::Modify<CustomGJBaseGameLayer, GJBaseGameLa
 
 	void processTimedInputs();
 	void dumpInputQueue();
+
+	// windows workaround
+	void fixUntimedInputs();
 };