Commit e1215e857f1be881e8bef04e1a772d0b9d67b2c9
2020-04-13T22:50:46
Fixed mouse button mapping on iOS
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
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index 538955c..e003513 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -33,6 +33,9 @@
#import "SDL_uikitmodes.h"
#import "SDL_uikitwindow.h"
+/* The maximum number of mouse buttons we support */
+#define MAX_MOUSE_BUTTONS 5
+
/* This is defined in SDL_sysjoystick.m */
extern int SDL_AppleTVRemoteOpenedAsJoystick;
@@ -223,8 +226,13 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
if (touch.type == UITouchTypeIndirectPointer) {
int i;
- for (i = SDL_BUTTON_LEFT; i <= SDL_BUTTON_X2; ++i) {
+ for (i = 1; i <= MAX_MOUSE_BUTTONS; ++i) {
if (event.buttonMask & SDL_BUTTON(i)) {
+ if (i == 2) {
+ i = SDL_BUTTON_RIGHT;
+ } else if (i == 3) {
+ i = SDL_BUTTON_MIDDLE;
+ }
SDL_SendMouseButton(sdlwindow, 0, SDL_PRESSED, i);
}
}
@@ -260,8 +268,13 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
if (touch.type == UITouchTypeIndirectPointer) {
int i;
- for (i = SDL_BUTTON_LEFT; i <= SDL_BUTTON_X2; ++i) {
+ for (i = 1; i <= MAX_MOUSE_BUTTONS; ++i) {
if (!(event.buttonMask & SDL_BUTTON(i))) {
+ if (i == 2) {
+ i = SDL_BUTTON_RIGHT;
+ } else if (i == 3) {
+ i = SDL_BUTTON_MIDDLE;
+ }
SDL_SendMouseButton(sdlwindow, 0, SDL_RELEASED, i);
}
}