Improved mouse, keyboard, and resize handling for macOS (#1436)

* Suppressed beep on unhandled key-down events on macOS * Added null check to window resize callback * Improved mouse-move event handling on macOS
jrouwe · Jan 4, 2025 · cf1f2d5 · cf1f2d5
1 parent a9d7cd1
commit cf1f2d5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/TestFramework/Input/MacOS/KeyboardMacOS.mm b/TestFramework/Input/MacOS/KeyboardMacOS.mm
@@ -75,6 +75,16 @@ @implementation KeyboardDelegate
 - (KeyboardDelegate *)init:(KeyboardMacOS *)Keyboard
 {
 	mKeyboard = Keyboard;
+
+    [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskKeyDown handler:^NSEvent *(NSEvent *event) {
+        // Ignore all keystrokes except Command-Q (Quit).
+        if ((event.modifierFlags & NSEventModifierFlagCommand) && [event.charactersIgnoringModifiers isEqual:@"q"]) {
+            return event;
+        } else {
+            return nil;
+        }
+    }];
+
 	return self;
 }
 

diff --git a/TestFramework/Window/ApplicationWindow.h b/TestFramework/Window/ApplicationWindow.h
@@ -29,7 +29,7 @@ class ApplicationWindow
 	virtual void					MainLoop(RenderCallback inRenderCallback) = 0;
 
 	/// Function that will trigger the callback
-	void							OnWindowResized(int inWidth, int inHeight) { mWindowWidth = inWidth; mWindowHeight = inHeight; mWindowResizeListener(); }
+	void							OnWindowResized(int inWidth, int inHeight) { mWindowWidth = inWidth; mWindowHeight = inHeight; if (mWindowResizeListener) { mWindowResizeListener(); } }
 
 protected:
 	int								mWindowWidth = 1920;

diff --git a/TestFramework/Window/ApplicationWindowMacOS.mm b/TestFramework/Window/ApplicationWindowMacOS.mm
@@ -38,10 +38,15 @@ - (bool)canBecomeKeyView
 	return YES;
 }
 
+- (BOOL)isFlipped {
+    return YES;
+}
+
 - (void)mouseMoved:(NSEvent *)event
 {
-	NSPoint location = [event locationInWindow];
-	mWindow->OnMouseMoved(location.x, mWindow->GetWindowHeight() - location.y);	
+    NSPoint locationInView = [self convertPoint:event.locationInWindow fromView:nil];
+    NSPoint locationInBacking = [self convertPointToBacking:locationInView];
+	mWindow->OnMouseMoved(locationInBacking.x, -locationInBacking.y);
 }
 
 - (void)drawInMTKView:(MTKView *)view