Commit e5d3629931f3c713fec8a7e476d2a06a526f9c95
2020-04-13T15:46:12
Added support for new mouse APIs in iOS 13.4
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301
diff --git a/Xcode-iOS/Test/Info.plist b/Xcode-iOS/Test/Info.plist
index 99b3e7a..99a1cb4 100644
--- a/Xcode-iOS/Test/Info.plist
+++ b/Xcode-iOS/Test/Info.plist
@@ -24,5 +24,7 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
+ <key>UIApplicationSupportsIndirectInputEvents</key>
+ <true/>
</dict>
</plist>
diff --git a/src/video/uikit/SDL_uikitview.h b/src/video/uikit/SDL_uikitview.h
index ce8ad3b..93bd862 100644
--- a/src/video/uikit/SDL_uikitview.h
+++ b/src/video/uikit/SDL_uikitview.h
@@ -25,12 +25,20 @@
#include "SDL_touch.h"
+#ifdef __IPHONE_13_4
+@interface SDL_uikitview : UIView <UIPointerInteractionDelegate>
+#else
@interface SDL_uikitview : UIView
+#endif
- (instancetype)initWithFrame:(CGRect)frame;
- (void)setSDLWindow:(SDL_Window *)window;
+#ifdef __IPHONE_13_4
+- (UIPointerRegion *)pointerInteraction:(UIPointerInteraction *)interaction regionForRequest:(UIPointerRegionRequest *)request defaultRegion:(UIPointerRegion *)defaultRegion API_AVAILABLE(ios(13.4));
+#endif
+
- (CGPoint)touchLocation:(UITouch *)touch shouldNormalize:(BOOL)normalize;
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index 0c56b86..da4c09d 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -75,6 +75,12 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
self.multipleTouchEnabled = YES;
SDL_AddTouch(directTouchId, SDL_TOUCH_DEVICE_DIRECT, "");
#endif
+
+#ifdef __IPHONE_13_4
+ if (@available(iOS 13.4, *)) {
+ [self addInteraction:[[UIPointerInteraction alloc] initWithDelegate:self]];
+ }
+#endif
}
return self;
@@ -136,6 +142,21 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
sdlwindow = window;
}
+#ifdef __IPHONE_13_4
+- (UIPointerRegion *)pointerInteraction:(UIPointerInteraction *)interaction regionForRequest:(UIPointerRegionRequest *)request defaultRegion:(UIPointerRegion *)defaultRegion API_AVAILABLE(ios(13.4)){
+ if (request != nil) {
+ CGPoint origin = self.bounds.origin;
+ CGPoint point = request.location;
+
+ point.x -= origin.x;
+ point.y -= origin.y;
+
+ SDL_SendMouseMotion(sdlwindow, 0, 0, (int)point.x, (int)point.y);
+ }
+ return defaultRegion;
+}
+#endif /* __IPHONE_13_4 */
+
- (SDL_TouchDeviceType)touchTypeForTouch:(UITouch *)touch
{
#ifdef __IPHONE_9_0
@@ -187,38 +208,64 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
{
for (UITouch *touch in touches) {
- SDL_TouchDeviceType touchType = [self touchTypeForTouch:touch];
- SDL_TouchID touchId = [self touchIdForType:touchType];
- float pressure = [self pressureForTouch:touch];
-
- if (SDL_AddTouch(touchId, touchType, "") < 0) {
- continue;
+ BOOL handled = NO;
+
+#ifdef __IPHONE_13_4
+ if (@available(iOS 13.4, *)) {
+ if (touch.type == UITouchTypeIndirectPointer) {
+ /* FIXME: How can we tell the difference between left and right button clicks? */
+ SDL_SendMouseButton(sdlwindow, 0, SDL_PRESSED, SDL_BUTTON_LEFT);
+ handled = YES;
+ }
}
+#endif
+ if (!handled) {
+ SDL_TouchDeviceType touchType = [self touchTypeForTouch:touch];
+ SDL_TouchID touchId = [self touchIdForType:touchType];
+ float pressure = [self pressureForTouch:touch];
+
+ if (SDL_AddTouch(touchId, touchType, "") < 0) {
+ continue;
+ }
- /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
+ /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
- CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
- SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch), sdlwindow,
- SDL_TRUE, locationInView.x, locationInView.y, pressure);
+ CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
+ SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch), sdlwindow,
+ SDL_TRUE, locationInView.x, locationInView.y, pressure);
+ }
}
}
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
{
for (UITouch *touch in touches) {
- SDL_TouchDeviceType touchType = [self touchTypeForTouch:touch];
- SDL_TouchID touchId = [self touchIdForType:touchType];
- float pressure = [self pressureForTouch:touch];
-
- if (SDL_AddTouch(touchId, touchType, "") < 0) {
- continue;
+ BOOL handled = NO;
+
+#ifdef __IPHONE_13_4
+ if (@available(iOS 13.4, *)) {
+ if (touch.type == UITouchTypeIndirectPointer) {
+ /* FIXME: How can we tell the difference between left and right button clicks? */
+ SDL_SendMouseButton(sdlwindow, 0, SDL_RELEASED, SDL_BUTTON_LEFT);
+ handled = YES;
+ }
}
+#endif
+ if (!handled) {
+ SDL_TouchDeviceType touchType = [self touchTypeForTouch:touch];
+ SDL_TouchID touchId = [self touchIdForType:touchType];
+ float pressure = [self pressureForTouch:touch];
- /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
+ if (SDL_AddTouch(touchId, touchType, "") < 0) {
+ continue;
+ }
+
+ /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
- CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
- SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch), sdlwindow,
- SDL_FALSE, locationInView.x, locationInView.y, pressure);
+ CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
+ SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch), sdlwindow,
+ SDL_FALSE, locationInView.x, locationInView.y, pressure);
+ }
}
}
@@ -230,79 +277,93 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
{
for (UITouch *touch in touches) {
- SDL_TouchDeviceType touchType = [self touchTypeForTouch:touch];
- SDL_TouchID touchId = [self touchIdForType:touchType];
- float pressure = [self pressureForTouch:touch];
+ BOOL handled = NO;
- if (SDL_AddTouch(touchId, touchType, "") < 0) {
- continue;
+#ifdef __IPHONE_13_4
+ if (@available(iOS 13.4, *)) {
+ if (touch.type == UITouchTypeIndirectPointer) {
+ /* Already handled in pointerInteraction callback */
+ handled = YES;
+ }
}
+#endif
+ if (!handled) {
+ SDL_TouchDeviceType touchType = [self touchTypeForTouch:touch];
+ SDL_TouchID touchId = [self touchIdForType:touchType];
+ float pressure = [self pressureForTouch:touch];
+
+ if (SDL_AddTouch(touchId, touchType, "") < 0) {
+ continue;
+ }
- CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
- SDL_SendTouchMotion(touchId, (SDL_FingerID)((size_t)touch), sdlwindow,
- locationInView.x, locationInView.y, pressure);
+ CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
+ SDL_SendTouchMotion(touchId, (SDL_FingerID)((size_t)touch), sdlwindow,
+ locationInView.x, locationInView.y, pressure);
+ }
}
}
#if TARGET_OS_TV || defined(__IPHONE_9_1)
- (SDL_Scancode)scancodeFromPress:(UIPress*)press
{
+#ifdef __IPHONE_13_4
if (press.key != nil) {
return (SDL_Scancode)press.key.keyCode;
}
+#endif
+
+ /* Presses from Apple TV remote */
+ if (!SDL_AppleTVRemoteOpenedAsJoystick) {
+ switch (press.type) {
+ case UIPressTypeUpArrow:
+ return SDL_SCANCODE_UP;
+ case UIPressTypeDownArrow:
+ return SDL_SCANCODE_DOWN;
+ case UIPressTypeLeftArrow:
+ return SDL_SCANCODE_LEFT;
+ case UIPressTypeRightArrow:
+ return SDL_SCANCODE_RIGHT;
+ case UIPressTypeSelect:
+ /* HIG says: "primary button behavior" */
+ return SDL_SCANCODE_RETURN;
+ case UIPressTypeMenu:
+ /* HIG says: "returns to previous screen" */
+ return SDL_SCANCODE_ESCAPE;
+ case UIPressTypePlayPause:
+ /* HIG says: "secondary button behavior" */
+ return SDL_SCANCODE_PAUSE;
+ default:
+ break;
+ }
+ }
- /* Presses from Apple TV remote */
- if (!SDL_AppleTVRemoteOpenedAsJoystick) {
- switch (press.type) {
- case UIPressTypeUpArrow:
- return SDL_SCANCODE_UP;
- case UIPressTypeDownArrow:
- return SDL_SCANCODE_DOWN;
- case UIPressTypeLeftArrow:
- return SDL_SCANCODE_LEFT;
- case UIPressTypeRightArrow:
- return SDL_SCANCODE_RIGHT;
- case UIPressTypeSelect:
- /* HIG says: "primary button behavior" */
- return SDL_SCANCODE_RETURN;
- case UIPressTypeMenu:
- /* HIG says: "returns to previous screen" */
- return SDL_SCANCODE_ESCAPE;
- case UIPressTypePlayPause:
- /* HIG says: "secondary button behavior" */
- return SDL_SCANCODE_PAUSE;
- default:
- break;
- }
- }
-
- return SDL_SCANCODE_UNKNOWN;
+ return SDL_SCANCODE_UNKNOWN;
}
- (void)pressesBegan:(NSSet<UIPress *> *)presses withEvent:(UIPressesEvent *)event
{
- for (UIPress *press in presses) {
- SDL_Scancode scancode = [self scancodeFromPress:press];
- SDL_SendKeyboardKey(SDL_PRESSED, scancode);
- }
+ for (UIPress *press in presses) {
+ SDL_Scancode scancode = [self scancodeFromPress:press];
+ SDL_SendKeyboardKey(SDL_PRESSED, scancode);
+ }
[super pressesBegan:presses withEvent:event];
}
- (void)pressesEnded:(NSSet<UIPress *> *)presses withEvent:(UIPressesEvent *)event
{
- for (UIPress *press in presses) {
- SDL_Scancode scancode = [self scancodeFromPress:press];
- SDL_SendKeyboardKey(SDL_RELEASED, scancode);
- }
+ for (UIPress *press in presses) {
+ SDL_Scancode scancode = [self scancodeFromPress:press];
+ SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+ }
[super pressesEnded:presses withEvent:event];
}
- (void)pressesCancelled:(NSSet<UIPress *> *)presses withEvent:(UIPressesEvent *)event
{
- for (UIPress *press in presses) {
- SDL_Scancode scancode = [self scancodeFromPress:press];
- SDL_SendKeyboardKey(SDL_RELEASED, scancode);
- }
+ for (UIPress *press in presses) {
+ SDL_Scancode scancode = [self scancodeFromPress:press];
+ SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+ }
[super pressesCancelled:presses withEvent:event];
}