[1mdiff --git a/sdl2.0.18-macos-ios.diff b/sdl2.0.18-macos-ios.diff[m
[1mnew file mode 100644[m
[1mindex 00000000..8c143226[m
[1m--- /dev/null[m
[1m+++ b/sdl2.0.18-macos-ios.diff[m
[36m@@ -0,0 +1,129 @@[m
[32m+[m[32mdiff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c[m
[32m+[m[32mindex 539f17138..a5a5b00fd 100644[m
[32m+[m[32m--- a/src/events/SDL_mouse.c[m
[32m+[m[32m+++ b/src/events/SDL_mouse.c[m
[32m+[m[32m@@ -709,8 +709,8 @@ SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, float x, float y, S[m
[32m+[m[32m event.type = SDL_MOUSEWHEEL;[m
[32m+[m[32m event.wheel.windowID = mouse->focus ? mouse->focus->id : 0;[m
[32m+[m[32m event.wheel.which = mouseID;[m
[32m+[m[32m- event.wheel.x = integral_x;[m
[32m+[m[32m- event.wheel.y = integral_y;[m
[32m+[m[32m+ event.wheel.x = x; //integral_x;[m
[32m+[m[32m+ event.wheel.y = y; //integral_y;[m
[32m+[m[32m event.wheel.preciseX = x;[m
[32m+[m[32m event.wheel.preciseY = y;[m
[32m+[m[32m event.wheel.direction = (Uint32)direction;[m
[32m+[m[32mdiff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m[m
[32m+[m[32mindex e9d832d64..4cfa3624b 100644[m
[32m+[m[32m--- a/src/video/cocoa/SDL_cocoamouse.m[m
[32m+[m[32m+++ b/src/video/cocoa/SDL_cocoamouse.m[m
[32m+[m[32m@@ -463,10 +463,16 @@ + (NSCursor *)invisibleCursor[m
[32m+[m[32m }[m
[32m+[m[41m [m
[32m+[m[32m SDL_MouseID mouseID = mouse->mouseID;[m
[32m+[m[32m- CGFloat x = -[event deltaX];[m
[32m+[m[32m- CGFloat y = [event deltaY];[m
[32m+[m[32m+ CGFloat x = -[event scrollingDeltaX];[m
[32m+[m[32m+ CGFloat y = [event scrollingDeltaY];[m
[32m+[m[32m SDL_MouseWheelDirection direction = SDL_MOUSEWHEEL_NORMAL;[m
[32m+[m[41m [m
[32m+[m[32m+ /* HACK: Make a distinction between precise and imprecise scrolling.[m
[32m+[m[32m+ Trackpad seems to be mouseID 0. */[m
[32m+[m[32m+ if (![event hasPreciseScrollingDeltas]) {[m
[32m+[m[32m+ mouseID = 1;[m
[32m+[m[32m+ }[m
[32m+[m[32m+[m
[32m+[m[32m if ([event respondsToSelector:@selector(isDirectionInvertedFromDevice)]) {[m
[32m+[m[32m if ([event isDirectionInvertedFromDevice] == YES) {[m
[32m+[m[32m direction = SDL_MOUSEWHEEL_FLIPPED;[m
[32m+[m[32mdiff --git a/src/video/cocoa/SDL_cocoawindow.h b/src/video/cocoa/SDL_cocoawindow.h[m
[32m+[m[32mindex 489db169f..79a41dd50 100644[m
[32m+[m[32m--- a/src/video/cocoa/SDL_cocoawindow.h[m
[32m+[m[32m+++ b/src/video/cocoa/SDL_cocoawindow.h[m
[32m+[m[32m@@ -110,6 +110,8 @@ typedef enum[m
[32m+[m[32m /* Touch event handling */[m
[32m+[m[32m -(void) handleTouches:(NSTouchPhase) phase withEvent:(NSEvent*) theEvent;[m
[32m+[m[41m [m
[32m+[m[32m+-(void) syncMouseButtonAndKeyboardModifierState;[m
[32m+[m[32m+[m
[32m+[m[32m @end[m
[32m+[m[32m /* INDENT-ON */[m
[32m+[m[41m [m
[32m+[m[32mdiff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m[m
[32m+[m[32mindex f09088c45..7379c2269 100644[m
[32m+[m[32m--- a/src/video/cocoa/SDL_cocoawindow.m[m
[32m+[m[32m+++ b/src/video/cocoa/SDL_cocoawindow.m[m
[32m+[m[32m@@ -1236,6 +1236,25 @@ - (void)otherMouseDown:(NSEvent *)theEvent[m
[32m+[m[32m [self mouseDown:theEvent];[m
[32m+[m[32m }[m
[32m+[m[41m [m
[32m+[m[32m+- (void)syncMouseButtonAndKeyboardModifierState {[m
[32m+[m[32m+ SDL_Mouse *mouse = SDL_GetMouse();[m
[32m+[m[32m+ if (mouse) {[m
[32m+[m[32m+ for (int i = 0; i < mouse->num_sources; i++) {[m
[32m+[m[32m+ if (mouse->sources[i].mouseID == mouse->mouseID) {[m
[32m+[m[32m+ mouse->sources[i].buttonstate = 0;[m
[32m+[m[32m+ }[m
[32m+[m[32m+ }[m
[32m+[m[32m+ }[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LGUI);[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_RGUI);[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LSHIFT);[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_RSHIFT);[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LCTRL);[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_RCTRL);[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LALT);[m
[32m+[m[32m+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_RALT);[m
[32m+[m[32m+}[m
[32m+[m[32m+[m
[32m+[m[32m - (void)mouseUp:(NSEvent *)theEvent[m
[32m+[m[32m {[m
[32m+[m[32m SDL_Mouse *mouse = SDL_GetMouse();[m
[32m+[m[32mdiff --git a/src/video/uikit/SDL_uikitviewcontroller.h b/src/video/uikit/SDL_uikitviewcontroller.h[m
[32m+[m[32mindex f7f4c9de6..50c72aad0 100644[m
[32m+[m[32m--- a/src/video/uikit/SDL_uikitviewcontroller.h[m
[32m+[m[32m+++ b/src/video/uikit/SDL_uikitviewcontroller.h[m
[32m+[m[32m@@ -58,10 +58,13 @@[m
[32m+[m[32m #if !TARGET_OS_TV[m
[32m+[m[32m - (NSUInteger)supportedInterfaceOrientations;[m
[32m+[m[32m - (BOOL)prefersStatusBarHidden;[m
[32m+[m[32m+- (void)setStatusStyle:(UIStatusBarStyle)style;[m
[32m+[m[32m+- (UIStatusBarStyle)preferredStatusBarStyle;[m
[32m+[m[32m - (BOOL)prefersHomeIndicatorAutoHidden;[m
[32m+[m[32m - (UIRectEdge)preferredScreenEdgesDeferringSystemGestures;[m
[32m+[m[41m [m
[32m+[m[32m @property (nonatomic, assign) int homeIndicatorHidden;[m
[32m+[m[32m+@property (nonatomic, assign) UIStatusBarStyle statusBarStyle;[m
[32m+[m[32m #endif[m
[32m+[m[41m [m
[32m+[m[32m #if SDL_IPHONE_KEYBOARD[m
[32m+[m[32mdiff --git a/src/video/uikit/SDL_uikitviewcontroller.m b/src/video/uikit/SDL_uikitviewcontroller.m[m
[32m+[m[32mindex b2db4037d..d39f8085c 100644[m
[32m+[m[32m--- a/src/video/uikit/SDL_uikitviewcontroller.m[m
[32m+[m[32m+++ b/src/video/uikit/SDL_uikitviewcontroller.m[m
[32m+[m[32m@@ -105,6 +105,7 @@ - (instancetype)initWithSDLWindow:(SDL_Window *)_window[m
[32m+[m[32m #endif[m
[32m+[m[41m [m
[32m+[m[32m #if !TARGET_OS_TV[m
[32m+[m[32m+ self.statusBarStyle = UIStatusBarStyleDefault;[m
[32m+[m[32m SDL_AddHintCallback(SDL_HINT_IOS_HIDE_HOME_INDICATOR,[m
[32m+[m[32m SDL_HideHomeIndicatorHintChanged,[m
[32m+[m[32m (__bridge void *) self);[m
[32m+[m[32m@@ -230,6 +231,17 @@ - (BOOL)prefersHomeIndicatorAutoHidden[m
[32m+[m[32m return hidden;[m
[32m+[m[32m }[m
[32m+[m[41m [m
[32m+[m[32m+- (void)setStatusStyle:(UIStatusBarStyle)style[m
[32m+[m[32m+{[m
[32m+[m[32m+ self.statusBarStyle = style;[m
[32m+[m[32m+ [self setNeedsStatusBarAppearanceUpdate];[m
[32m+[m[32m+}[m
[32m+[m[32m+[m
[32m+[m[32m+- (UIStatusBarStyle)preferredStatusBarStyle[m
[32m+[m[32m+{[m
[32m+[m[32m+ return self.statusBarStyle;[m
[32m+[m[32m+}[m
[32m+[m[32m+[m
[32m+[m[32m - (UIRectEdge)preferredScreenEdgesDeferringSystemGestures[m
[32m+[m[32m {[m
[32m+[m[32m if (self.homeIndicatorHidden >= 0) {[m
text/plain
This content has been proxied by September (ba2dc).