cocoa: Don't report trackpad mouse events as synthesized touches.

Fixes Bugzilla #4690, sort of. I guess.
libsdl-org · Jul 2, 2019 · d2d06f4 · d2d06f4
1 parent d2058b4
commit d2d06f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m
@@ -38,6 +38,8 @@
 #define DLog(...) do { } while (0)
 #endif
 
+#define TRACKPAD_REPORTS_TOUCH_MOUSEID 0
+
 @implementation NSCursor (InvisibleCursor)
 + (NSCursor *)invisibleCursor
 {
@@ -379,13 +381,15 @@ + (NSCursor *)invisibleCursor
     }
 
     SDL_MouseID mouseID = mouse ? mouse->mouseID : 0;
+    #if TRACKPAD_REPORTS_TOUCH_MOUSEID
     if ([event subtype] == NSEventSubtypeTouch) {  /* this is a synthetic from the OS */
         if (mouse->touch_mouse_events) {
             mouseID = SDL_TOUCH_MOUSEID;   /* Hint is set */
         } else {
             return;  /* no hint set, drop this one. */
         }
     }
+    #endif
 
     const SDL_bool seenWarp = driverdata->seenWarp;
     driverdata->seenWarp = NO;
@@ -432,13 +436,15 @@ + (NSCursor *)invisibleCursor
     }
 
     SDL_MouseID mouseID = mouse->mouseID;
+    #if TRACKPAD_REPORTS_TOUCH_MOUSEID
     if ([event subtype] == NSEventSubtypeTouch) {  /* this is a synthetic from the OS */
         if (mouse->touch_mouse_events) {
             mouseID = SDL_TOUCH_MOUSEID;   /* Hint is set */
         } else {
             return;  /* no hint set, drop this one. */
         }
     }
+    #endif
 
     CGFloat x = -[event deltaX];
     CGFloat y = [event deltaY];

diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
@@ -922,13 +922,15 @@ - (void)mouseDown:(NSEvent *)theEvent
     int button;
     int clicks;
 
+    #if TRACKPAD_REPORTS_TOUCH_MOUSEID
     if ([theEvent subtype] == NSEventSubtypeTouch) {  /* this is a synthetic from the OS */
         if (mouse->touch_mouse_events) {
             mouseID = SDL_TOUCH_MOUSEID;   /* Hint is set */
         } else {
             return;  /* no hint set, drop this one. */
         }
     }
+    #endif
 
     /* Ignore events that aren't inside the client area (i.e. title bar.) */
     if ([theEvent window]) {
@@ -991,13 +993,15 @@ - (void)mouseUp:(NSEvent *)theEvent
     int button;
     int clicks;
 
+    #if TRACKPAD_REPORTS_TOUCH_MOUSEID
     if ([theEvent subtype] == NSEventSubtypeTouch) {  /* this is a synthetic from the OS */
         if (mouse->touch_mouse_events) {
             mouseID = SDL_TOUCH_MOUSEID;   /* Hint is set */
         } else {
             return;  /* no hint set, drop this one. */
         }
     }
+    #endif
 
     if ([self processHitTest:theEvent]) {
         SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIT_TEST, 0, 0);
@@ -1051,13 +1055,15 @@ - (void)mouseMoved:(NSEvent *)theEvent
     NSPoint point;
     int x, y;
 
+    #if TRACKPAD_REPORTS_TOUCH_MOUSEID
     if ([theEvent subtype] == NSEventSubtypeTouch) {  /* this is a synthetic from the OS */
         if (mouse->touch_mouse_events) {
             mouseID = SDL_TOUCH_MOUSEID;   /* Hint is set */
         } else {
             return;  /* no hint set, drop this one. */
         }
     }
+    #endif
 
     if ([self processHitTest:theEvent]) {
         SDL_SendWindowEvent(window, SDL_WINDOWEVENT_HIT_TEST, 0, 0);