We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch for multiple buttons at the same time not working

multiple_buttons_at_the_same_time_on_android_patch.diff (text/plain), 2.88 KB, created by Philipp Wiesemann on 2016-01-14 20:06:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Wiesemann

Created: 2016-01-14 20:06:10 UTC

Size: 2.88 KB

patch

obsolete

>diff -r d710a7a66aa5 src/video/android/SDL_androidmouse.c
>--- a/src/video/android/SDL_androidmouse.c	Wed Jan 13 19:31:03 2016 +0100
>+++ b/src/video/android/SDL_androidmouse.c	Thu Jan 14 21:01:13 2016 +0100
>@@ -30,6 +30,7 @@
> 
> #include "../../core/android/SDL_android.h"
> 
>+/* See Android's MotionEvent class for constants */
> #define ACTION_DOWN 0
> #define ACTION_UP 1
> #define ACTION_HOVER_MOVE 7
>@@ -40,41 +41,59 @@
> #define BUTTON_BACK 8
> #define BUTTON_FORWARD 16
> 
>-static Uint8 SDLButton;
>+/* Last known Android mouse button state (includes all buttons) */
>+static int last_state;
> 
> void
> Android_InitMouse(void)
> {
>-    SDLButton = 0;
>+    last_state = 0;
> }
> 
>-void Android_OnMouse( int androidButton, int action, float x, float y) {
>+/* Translate Android mouse button state to SDL mouse button */
>+static Uint8
>+TranslateButton(int state)
>+{
>+    if (state & BUTTON_PRIMARY) {
>+        return SDL_BUTTON_LEFT;
>+    } else if (state & BUTTON_SECONDARY) {
>+        return SDL_BUTTON_RIGHT;
>+    } else if (state & BUTTON_TERTIARY) {
>+        return SDL_BUTTON_MIDDLE;
>+    } else if (state & BUTTON_FORWARD) {
>+        return SDL_BUTTON_X1;
>+    } else if (state & BUTTON_BACK) {
>+        return SDL_BUTTON_X2;
>+    } else {
>+        return 0;
>+    }
>+}
>+
>+void
>+Android_OnMouse(int state, int action, float x, float y)
>+{
>+    int changes;
>+    Uint8 button;
>+
>     if (!Android_Window) {
>         return;
>     }
> 
>     switch(action) {
>         case ACTION_DOWN:
>-            // Determine which button originated the event, and store it for ACTION_UP
>-            SDLButton = SDL_BUTTON_LEFT;
>-            if (androidButton == BUTTON_SECONDARY) {
>-                SDLButton = SDL_BUTTON_RIGHT;
>-            } else if (androidButton == BUTTON_TERTIARY) {
>-                SDLButton = SDL_BUTTON_MIDDLE;
>-            } else if (androidButton == BUTTON_FORWARD) {
>-                SDLButton = SDL_BUTTON_X1;
>-            } else if (androidButton == BUTTON_BACK) {
>-                SDLButton = SDL_BUTTON_X2;
>-            }
>+            changes = state & ~last_state;
>+            button = TranslateButton(changes);
>+            last_state = state;
>             SDL_SendMouseMotion(Android_Window, 0, 0, x, y);
>-            SDL_SendMouseButton(Android_Window, 0, SDL_PRESSED, SDLButton);
>+            SDL_SendMouseButton(Android_Window, 0, SDL_PRESSED, button);
>             break;
> 
>         case ACTION_UP:
>-            // Android won't give us the button that originated the ACTION_DOWN event, so we'll
>-            // assume it's the one we stored
>+            changes = last_state & ~state;
>+            button = TranslateButton(changes);
>+            last_state = state;
>             SDL_SendMouseMotion(Android_Window, 0, 0, x, y);
>-            SDL_SendMouseButton(Android_Window, 0, SDL_RELEASED, SDLButton);
>+            SDL_SendMouseButton(Android_Window, 0, SDL_RELEASED, button);
>             break;
> 
>         case ACTION_HOVER_MOVE:

Actions: View | Diff

Attachments on bug 3227: 2365

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.