AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 02:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Menubar partially works on OSX now

Browse Source
This commit is contained in:
UnknownShadow200 2019-06-17 22:28:27 +10:00
parent 6429663853
commit f33febed15
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/InputHandler.c
View File

@ -416,6 +416,7 @@ static void InputHandler_MouseWheel(void* obj, float delta) {
static void InputHandler_MouseMove(void* obj, int xDelta, int yDelta) {
struct Screen* active = Gui_GetActiveScreen();
/* In case MouseMove is called before game is fully initialised */
if (active) Elem_HandlesMouseMove(active, Mouse_X, Mouse_Y);
}

28
src/Window.c
View File

@ -1436,6 +1436,7 @@ void Window_DisableRawMouse(void) { Window_DefaultDisableRawMouse(); }
#ifdef CC_BUILD_CARBON
#include <ApplicationServices/ApplicationServices.h>
#include <Carbon/Carbon.h>
#include <dlfcn.h>
static WindowRef win_handle;
static bool win_fullscreen;
@ -1659,6 +1660,8 @@ static OSStatus Window_EventHandler(EventHandlerCallRef inCaller, EventRef inEve
return eventNotHandledErr;
}
typedef EventTargetRef (*GetMenuBarEventTarget_Func)(void);
static void Window_ConnectEvents(void) {
static EventTypeSpec eventTypes[] = {
{ kEventClassApplication, kEventAppActivated },
@ -1685,13 +1688,30 @@ static void Window_ConnectEvents(void) {
{ kEventClassTextInput, kEventTextInputUnicodeForKeyEvent },
{ kEventClassAppleEvent, kEventAppleEvent }
};
GetMenuBarEventTarget_Func getMenuBarEventTarget;
EventTargetRef target;
OSStatus res;
target = GetWindowEventTarget(win_handle);
res = InstallEventHandler(target, NewEventHandlerUPP(Window_EventHandler),
Array_Elems(eventTypes), eventTypes, NULL, NULL);
if (res) Logger_Abort2(res, "Connecting events");
InstallEventHandler(target, NewEventHandlerUPP(Window_EventHandler),
Array_Elems(eventTypes), eventTypes, NULL, NULL);
/* The code below is to get the menubar working. */
/* The documentation for 'RunApplicationEventLoop' states that it installs */
/* the standard application event handler which lets the menubar work. */
/* However, we cannot use that since the event loop is managed by us instead. */
/* Unfortunately, there is no proper API to duplicate that behaviour, so reply */
/* on the undocumented GetMenuBarEventTarget to achieve similar behaviour. */
getMenuBarEventTarget = dlsym(RTLD_DEFAULT, "GetMenuBarEventTarget");
InstallStandardEventHandler(GetApplicationEventTarget());
/* TODO: Why does this not work properly? and why does it break with quit? */
if (getMenuBarEventTarget) {
InstallStandardEventHandler(getMenuBarEventTarget());
} else {
Platform_LogConst("MenuBar won't work!");
}
/* MenuRef menu = AcquireRootMenu(); */
/* InstallStandardEventHandler(GetMenuEventTarget(menu)); */
}