AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 12:35:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get 'quit' in dockbar to work for cocoa

Browse Source
This commit is contained in:
UnknownShadow200 2019-09-20 19:35:05 +10:00
parent af0f7f9d89
commit d167b227da
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Window.c
View File

@ -1649,6 +1649,18 @@ static void Window_CommonInit(void) {
Display_BitsPerPixel = CGDisplayBitsPerPixel(display); Display_BitsPerPixel = CGDisplayBitsPerPixel(display);
} }
static pascal OSErr HandleQuitMessage(const AppleEvent* ev, AppleEvent* reply, long handlerRefcon) {
Window_Close();
return 0;
}
static void Window_CommonCreate(void) {
Window_Exists = true;
/* for quit buttons in dock and menubar */
AEInstallEventHandler(kCoreEventClass, kAEQuitApplication,
NewAEEventHandlerUPP(HandleQuitMessage), 0, false);
}
/* Sourced from https://www.meandmark.com/keycodes.html */ /* Sourced from https://www.meandmark.com/keycodes.html */
static const cc_uint8 key_map[8 * 16] = { static const cc_uint8 key_map[8 * 16] = {
'A', 'S', 'D', 'F', 'H', 'G', 'Z', 'X', 'C', 'V', 0, 'B', 'Q', 'W', 'E', 'R', 'A', 'S', 'D', 'F', 'H', 'G', 'Z', 'X', 'C', 'V', 0, 'B', 'Q', 'W', 'E', 'R',
@ -1976,10 +1988,6 @@ static OSStatus Window_EventHandler(EventHandlerCallRef inCaller, EventRef inEve
return eventNotHandledErr; return eventNotHandledErr;
} }
static pascal OSErr HandleQuitMessage(const AppleEvent* ev, AppleEvent* reply, long handlerRefcon) {
Window_Close();
return 0;
}
typedef EventTargetRef (*GetMenuBarEventTarget_Func)(void); typedef EventTargetRef (*GetMenuBarEventTarget_Func)(void);
static void Window_ConnectEvents(void) { static void Window_ConnectEvents(void) {
@ -2017,9 +2025,6 @@ static void Window_ConnectEvents(void) {
InstallEventHandler(target, NewEventHandlerUPP(Window_EventHandler), InstallEventHandler(target, NewEventHandlerUPP(Window_EventHandler),
Array_Elems(appEventTypes), appEventTypes, NULL, NULL); Array_Elems(appEventTypes), appEventTypes, NULL, NULL);
AEInstallEventHandler(kCoreEventClass, kAEQuitApplication,
NewAEEventHandlerUPP(HandleQuitMessage), 0, false);
/* The code below is to get the menubar working. */ /* The code below is to get the menubar working. */
/* The documentation for 'RunApplicationEventLoop' states that it installs */ /* The documentation for 'RunApplicationEventLoop' states that it installs */
/* the standard application event handler which lets the menubar work. */ /* the standard application event handler which lets the menubar work. */
@ -2066,7 +2071,7 @@ void Window_Create(int width, int height) {
/* TODO: Use BringWindowToFront instead.. (look in the file which has RepositionWindow in it) !!!! */ /* TODO: Use BringWindowToFront instead.. (look in the file which has RepositionWindow in it) !!!! */
Window_ConnectEvents(); Window_ConnectEvents();
Window_Exists = true; Window_CommonCreate();
Window_Handle = win_handle; Window_Handle = win_handle;
} }
@ -3726,8 +3731,8 @@ void Window_Create(int width, int height) {
winHandle = objc_msgSend((id)objc_getClass("NSWindow"), sel_registerName("alloc")); winHandle = objc_msgSend((id)objc_getClass("NSWindow"), sel_registerName("alloc"));
objc_msgSend(winHandle, sel_registerName("initWithContentRect:styleMask:backing:defer:"), rect, (NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask), 0, false); objc_msgSend(winHandle, sel_registerName("initWithContentRect:styleMask:backing:defer:"), rect, (NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask), 0, false);
Window_Exists = true;
Window_CommonCreate();
funcs = Window_MakeDelegate(); funcs = Window_MakeDelegate();
objc_msgSend(winHandle, sel_registerName("setDelegate:"), funcs); objc_msgSend(winHandle, sel_registerName("setDelegate:"), funcs);