Skip to content

attempted mac modifier key fix #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

attempted mac modifier key fix #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 30 additions & 16 deletions src/macos.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,47 @@
#include <objc/runtime.h>
#undef CommentType

#import <Geode/cocos/platform/mac/EAGLView.h>

using namespace geode::prelude;

static IMP s_originalSendEventIMP;
void flagsChangedExecHook(EAGLView* self, SEL sel, NSEvent* event) {
auto keyboardDispatcher = cocos2d::CCDirector::sharedDirector()->getKeyboardDispatcher();

auto shiftPressed = [event modifierFlags] & NSEventModifierFlagShift;
if (keyboardDispatcher->m_bShiftPressed != shiftPressed) {
keyboardDispatcher->dispatchKeyboardMSG(enumKeyCodes::KEY_Shift, shiftPressed, false);
}

void sendEvent(NSApplication* self, SEL sel, NSEvent* event) {
NSEventType type;
auto altPressed = [event modifierFlags] & NSEventModifierFlagOption;
if (keyboardDispatcher->m_bAltPressed != altPressed) {
keyboardDispatcher->dispatchKeyboardMSG(enumKeyCodes::KEY_Alt, altPressed, false);
}

type = [event type];
if (type == NSEventTypeKeyUp) {
switch (type) {
case NSEventTypeKeyUp:
[[[self mainWindow] firstResponder] tryToPerform:@selector(keyUp:) with:event ];
return;
default:
break;
}
auto controlPressed = [event modifierFlags] & NSEventModifierFlagControl;
if (keyboardDispatcher->m_bControlPressed != controlPressed) {
keyboardDispatcher->dispatchKeyboardMSG(enumKeyCodes::KEY_Control, controlPressed, false);
}

((decltype(&sendEvent))s_originalSendEventIMP)(self, sel, event);
auto commandPressed = [event modifierFlags] & NSEventModifierFlagCommand;
if (keyboardDispatcher->m_bCommandPressed != commandPressed) {
// there's not actually a command keycode so this might be bad
keyboardDispatcher->dispatchKeyboardMSG(enumKeyCodes::KEY_Control, commandPressed, false);
}

// gd should call updateModifierKeys for us. not that i think it does but it should
[self performSelector:sel withObject:event];
}

#define HOOK_OBJC_METHOD(klass, methodName) \
auto methodName##Addr = class_getInstanceMethod(klass, @selector(methodName:)); \
static_cast<void>(Mod::get()->hook(reinterpret_cast<void*>(method_getImplementation(methodName##Addr)), &methodName##Hook, #klass " " #methodName));

$execute {
// yep, we're hooking cocoa girls

auto method = class_getInstanceMethod(objc_getClass("NSApplication"), @selector(sendEvent:));
s_originalSendEventIMP = method_getImplementation(method);
method_setImplementation(method, (IMP)&sendEvent);
auto eaglView = objc_getClass("EAGLView");
HOOK_OBJC_METHOD(eaglView, flagsChangedExec);
}

#endif