feat(utils): Remove MacOS includes from header because Mac is quirky

Author: SpaghettDev

src/macos.mm

@@ -10,23 +10,40 @@
 #import <Geode/cocos/platform/mac/EAGLView.h>
 #import <objc/runtime.h>
 
+#include "BetterTextInputNode.hpp"
+
 #include "types/TouchMessageType.hpp"
+#include "utils.hpp"
+
+namespace BI::platform
+{
+	inline bool keyDown(PlatformKey key, NSEvent* event)
+	{
+		switch (key)
+		{
+			case BI::PlatformKey::LEFT_CONTROL:
+				return ([event modifierFlags] & NSCommandKeyMask);
+			case BI::PlatformKey::LEFT_SHIFT:
+				return ([event modifierFlags] & NSShiftKeyMask);
+		}
+
+		return false;
+	}
+}
 
 #define HOOK_OBJC_METHOD(klass, cleanFuncName, funcName) \
 	auto cleanFuncName ## Method = class_getInstanceMethod(objc_getClass(#klass), @selector(funcName)); \
 	cleanFuncName ## OIMP = method_getImplementation(cleanFuncName ## Method); \
 	method_setImplementation(cleanFuncName ## Method, (EventType<klass>)&funcName);
 
-#define CALL_OIMP(funcName) reinterpret_cast<decltype(&funcName)>(funcName ## OIMP)(self, sel, event)
-
 template <typename T>
 using EventType = void(*)(T*, SEL, NSEvent*);
 
 
 static EventType<EAGLView> keyDownExecOIMP;
 void keyDownExec(EAGLView* self, SEL sel, NSEvent* event) {
 	if (!g_selectedInput)
-		CALL_OIMP(keyDownExec);
+		keyDownExecOIMP(self, sel, event);
 
 	// on click, can be held
 	if (
@@ -140,37 +157,37 @@ void keyDownExec(EAGLView* self, SEL sel, NSEvent* event) {
 			!BI::platform::keyDown(BI::PlatformKey::LEFT_CONTROL, event) &&
 			[event keyCode] == kVK_Return
 		) {
-			CALL_OIMP(keyDownExec);
+			keyDownExec(self, sel, event);
 		}
 	}
 }
 
 static EventType<EAGLView> keyUpExecOIMP;
 void keyUpExec(EAGLView* self, SEL sel, NSEvent* event) {
 	if (!g_selectedInput)
-		CALL_OIMP(keyUpExec);
+		keyUpExec(self, sel, event);
 }
 
 
 // TODO: move to hooking mouseDownExec
 // handles mouse clicks
-struct BetterTouchDispatcher : Modify<BetterTouchDispatcher, CCTouchDispatcher>
+struct BetterTouchDispatcher : geode::Modify<BetterTouchDispatcher, cocos2d::CCTouchDispatcher>
 {
 	// https://github.com/ninXout/Crystal-Client/blob/7df5a8336ccb852bc984e55dd29ca27bb1741443/src/ImGui/ImGui.cpp#L96
 	void touches(cocos2d::CCSet* touches, cocos2d::CCEvent* event, unsigned int type)
 	{
 		if (!g_selectedInput)
-			return CCTouchDispatcher::touches(touches, event, type);
+			return cocos2d::CCTouchDispatcher::touches(touches, event, type);
 
-		auto* touch = static_cast<CCTouch*>(touches->anyObject());
+		auto* touch = static_cast<cocos2d::CCTouch*>(touches->anyObject());
 		const auto touchPos = touch->getLocation();
 
 		if (type == TouchMessageType::Began)
 		{
-			CCSize winSize = CCDirector::sharedDirector()->getWinSize();
+			CCSize winSize = cocos2d::CCDirector::sharedDirector()->getWinSize();
 
 			// the touch event's origin is bottom left
-			CCTouch touch{};
+			cocos2d::CCTouch touch{};
 			touch.setTouchInfo(0, touchPos.x, winSize.height - touchPos.y);
 
 			g_selectedInput->useUpdateBlinkPos(true);

src/utils.hpp

@@ -5,11 +5,6 @@
 #include <Geode/cocos/robtop/glfw/glfw3.h>
 
 #include <WinUser.h> // virtual keys
-#elif defined(GEODE_IS_MACOS)
-#define CommentType CommentTypeDummy
-#import <Cocoa/Cocoa.h>
-#include <AppKit/NSEvent.h>
-#undef CommentType
 #endif
 
 #include <Geode/cocos/cocoa/CCGeometry.h>
@@ -153,19 +148,6 @@ namespace BI
 					return GetKeyState(VK_SHIFT) & 0x8000;
 			}
 
-			return false;
-		}
-#elif defined(GEODE_IS_MACOS)
-		inline bool keyDown(PlatformKey key, NSEvent* event)
-		{
-			switch (key)
-			{
-				case BI::PlatformKey::LEFT_CONTROL:
-					return ([event modifierFlags] & NSCommandKeyMask);
-				case BI::PlatformKey::LEFT_SHIFT:
-					return ([event modifierFlags] & NSShiftKeyMask);
-			}
-
 			return false;
 		}
 #endif