From 1cd3e83756c936cf489ad15f15b94b764d4f2372 Mon Sep 17 00:00:00 2001
From: Zack Middleton <[EMAIL REDACTED]>
Date: Sun, 14 Nov 2021 15:51:38 -0500
Subject: [PATCH] cocoa: Fix abort on touch event types without a subtype
macOS 10.6 has some touch NSEvents which do not have a subtype
(Begin/EndGesture, Magnify, Rotate, Swipe) and cause an uncaught
exception which triggers SIGABRT and the program exits.
As it is, none of the macOS 10.6 touch events are detected as a
trackpad (including Gesture due to using different subtypes).
---
src/video/cocoa/SDL_cocoawindow.m | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index 37b4c1540d..af9e3dbdbb 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -1319,7 +1319,18 @@ - (void)touchesBeganWithEvent:(NSEvent *) theEvent
{
/* probably a MacBook trackpad; make this look like a synthesized event.
This is backwards from reality, but better matches user expectations. */
- const BOOL istrackpad = ([theEvent subtype] == NSEventSubtypeMouseEvent);
+ BOOL istrackpad = NO;
+ @try {
+ istrackpad = ([theEvent subtype] == NSEventSubtypeMouseEvent);
+ }
+ @catch (NSException *e) {
+ /* if NSEvent type doesn't have subtype, such as NSEventTypeBeginGesture on
+ * macOS 10.5 to 10.10, then NSInternalInconsistencyException is thrown.
+ * This still prints a message to terminal so catching it's not an ideal solution.
+ *
+ * *** Assertion failure in -[NSEvent subtype]
+ */
+ }
NSSet *touches = [theEvent touchesMatchingPhase:NSTouchPhaseAny inView:nil];
const SDL_TouchID touchID = istrackpad ? SDL_MOUSE_TOUCHID : (SDL_TouchID)(intptr_t)[[touches anyObject] device];
@@ -1370,7 +1381,18 @@ - (void)handleTouches:(NSTouchPhase) phase withEvent:(NSEvent *) theEvent
/* probably a MacBook trackpad; make this look like a synthesized event.
This is backwards from reality, but better matches user expectations. */
- const BOOL istrackpad = ([theEvent subtype] == NSEventSubtypeMouseEvent);
+ BOOL istrackpad = NO;
+ @try {
+ istrackpad = ([theEvent subtype] == NSEventSubtypeMouseEvent);
+ }
+ @catch (NSException *e) {
+ /* if NSEvent type doesn't have subtype, such as NSEventTypeBeginGesture on
+ * macOS 10.5 to 10.10, then NSInternalInconsistencyException is thrown.
+ * This still prints a message to terminal so catching it's not an ideal solution.
+ *
+ * *** Assertion failure in -[NSEvent subtype]
+ */
+ }
for (NSTouch *touch in touches) {
const SDL_TouchID touchId = istrackpad ? SDL_MOUSE_TOUCHID : (SDL_TouchID)(intptr_t)[touch device];