ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-03-29 18:06:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mac] Cmd-Q should raise Closing events

Browse source 
It should also be cancelable.
This commit is contained in:
thefiddler 2014-04-28 16:19:04 +02:00
parent 160e6ecb31
commit 53d2c8d1e8
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Source/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs
View file

@ -28,6 +28,7 @@
#endregion #endregion
using System; using System;
using System.ComponentModel;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using OpenTK.Platform.MacOS; using OpenTK.Platform.MacOS;
@ -38,13 +39,19 @@ namespace OpenTK.Platform.MacOS
internal static IntPtr Handle; internal static IntPtr Handle;
internal static IntPtr AutoreleasePool; internal static IntPtr AutoreleasePool;
static readonly IntPtr selQuit = Selector.Get("quit");
internal static void Initialize() internal static void Initialize()
{ {
// Create the NSAutoreleasePool // Create the NSAutoreleasePool
AutoreleasePool = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSAutoreleasePool"), Selector.Alloc), Selector.Init); AutoreleasePool = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSAutoreleasePool"), Selector.Alloc), Selector.Init);
// Register a Quit method to be called on cmd-q
IntPtr nsapp = Class.Get("NSApplication");
Class.RegisterMethod(nsapp, new OnQuitDelegate(OnQuit), "quit", "v@:");
// Fetch the application handle // Fetch the application handle
Handle = Cocoa.SendIntPtr(Class.Get("NSApplication"), Selector.Get("sharedApplication")); Handle = Cocoa.SendIntPtr(nsapp, Selector.Get("sharedApplication"));
// Setup the application // Setup the application
Cocoa.SendBool(Handle, Selector.Get("setActivationPolicy:"), (int)NSApplicationActivationPolicy.Regular); Cocoa.SendBool(Handle, Selector.Get("setActivationPolicy:"), (int)NSApplicationActivationPolicy.Regular);
@ -65,7 +72,7 @@ namespace OpenTK.Platform.MacOS
var appMenu = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSMenu"), Selector.Alloc), var appMenu = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSMenu"), Selector.Alloc),
Selector.Autorelease); Selector.Autorelease);
var quitMenuItem = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSMenuItem"), Selector.Alloc), var quitMenuItem = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSMenuItem"), Selector.Alloc),
Selector.Get("initWithTitle:action:keyEquivalent:"), Cocoa.ToNSString("Quit"), Selector.Get("terminate:"), Cocoa.ToNSString("q")), Selector.Get("initWithTitle:action:keyEquivalent:"), Cocoa.ToNSString("Quit"), selQuit, Cocoa.ToNSString("q")),
Selector.Autorelease); Selector.Autorelease);
Cocoa.SendIntPtr(appMenu, Selector.Get("addItem:"), quitMenuItem); Cocoa.SendIntPtr(appMenu, Selector.Get("addItem:"), quitMenuItem);
@ -74,5 +81,18 @@ namespace OpenTK.Platform.MacOS
// Tell cocoa we're ready to run the application (usually called by [NSApp run]). // Tell cocoa we're ready to run the application (usually called by [NSApp run]).
Cocoa.SendVoid(Handle, Selector.Get("finishLaunching")); Cocoa.SendVoid(Handle, Selector.Get("finishLaunching"));
} }
internal static event EventHandler<CancelEventArgs> Quit = delegate { };
delegate void OnQuitDelegate(IntPtr self, IntPtr cmd);
static void OnQuit(IntPtr self, IntPtr cmd)
{
var e = new CancelEventArgs();
Quit(null, e);
if (!e.Cancel)
{
Cocoa.SendVoid(Handle, Selector.Get("terminate:"), Handle);
}
}
} }
} }

12
Source/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
View file

@ -127,7 +127,7 @@ namespace OpenTK.Platform.MacOS
private IntPtr windowClass; private IntPtr windowClass;
private IntPtr trackingArea; private IntPtr trackingArea;
private bool disposed = false; private bool disposed = false;
private bool exists = true; private bool exists;
private bool cursorVisible = true; private bool cursorVisible = true;
private System.Drawing.Icon icon; private System.Drawing.Icon icon;
private LegacyInputDriver inputDriver = new LegacyInputDriver(); private LegacyInputDriver inputDriver = new LegacyInputDriver();
@ -184,6 +184,9 @@ namespace OpenTK.Platform.MacOS
SetTitle(title, false); SetTitle(title, false);
ResetTrackingArea(); ResetTrackingArea();
exists = true;
NSApplication.Quit += ApplicationQuit;
} }
delegate void WindowKeyDownDelegate(IntPtr self, IntPtr cmd, IntPtr notification); delegate void WindowKeyDownDelegate(IntPtr self, IntPtr cmd, IntPtr notification);
@ -222,6 +225,12 @@ namespace OpenTK.Platform.MacOS
Resize(this, EventArgs.Empty); Resize(this, EventArgs.Empty);
} }
private void ApplicationQuit(object sender, CancelEventArgs e)
{
bool close = WindowShouldClose(windowInfo.Handle, IntPtr.Zero, IntPtr.Zero);
e.Cancel |= !close;
}
private void WindowDidMove(IntPtr self, IntPtr cmd, IntPtr notification) private void WindowDidMove(IntPtr self, IntPtr cmd, IntPtr notification)
{ {
// Problem: Called only when you stop moving for a brief moment, // Problem: Called only when you stop moving for a brief moment,
@ -919,6 +928,7 @@ namespace OpenTK.Platform.MacOS
return; return;
Debug.Print("Disposing of CocoaNativeWindow."); Debug.Print("Disposing of CocoaNativeWindow.");
NSApplication.Quit -= ApplicationQuit;
CursorVisible = true; CursorVisible = true;
disposed = true; disposed = true;