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 handling of POV hat

sdl2_android_joystick_hat_20131112.diff (text/plain), 7.09 KB, created by ny00 on 2013-11-12 12:16:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ny00

Created: 2013-11-12 12:16:49 UTC

Size: 7.09 KB

patch

obsolete

>diff -r 965b7e09c5a8 android-project/src/org/libsdl/app/SDLActivity.java
>--- a/android-project/src/org/libsdl/app/SDLActivity.java	Mon Nov 11 10:15:35 2013 -0300
>+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Tue Nov 12 13:35:49 2013 +0200
>@@ -249,6 +249,7 @@
>     public static native void onNativePadUp(int padId, int keycode);
>     public static native void onNativeJoy(int joyId, int axis,
>                                           float value);
>+    public static native void onNativeHat(int joyId, int x, int y);
>     public static native void onNativeKeyDown(int keycode);
>     public static native void onNativeKeyUp(int keycode);
>     public static native void onNativeKeyboardFocusLost();
>@@ -433,6 +434,10 @@
>         return mJoystickHandler.getJoystickAxes(joy);
>     }
>     
>+    public static int getJoystickHats(int joy) {
>+        return mJoystickHandler.getJoystickHats(joy);
>+    }
>+    
>     public static boolean handleJoystickMotionEvent(MotionEvent event) {
>         return mJoystickHandler.handleMotionEvent(event);
>     }
>@@ -837,6 +842,10 @@
>         return 0;
>     }
>     
>+    public int getJoystickHats(int joy) {
>+        return 0;
>+    }
>+    
>     /**
>      * @param devId the device id to get opened joystick id for.
>      * @return joystick id for device id or -1 if there is none.
>@@ -857,6 +866,7 @@
>         public int id;
>         public String name;
>         public ArrayList<InputDevice.MotionRange> axes;
>+        public boolean hasHat;
>     }
>     
>     private ArrayList<SDLJoystick> mJoysticks;
>@@ -875,11 +885,16 @@
>                 joystick.id = deviceIds[i];
>                 joystick.name = joystickDevice.getName();
>                 joystick.axes = new ArrayList<InputDevice.MotionRange>();
>+                joystick.hasHat = false;
>                 
>                 for (InputDevice.MotionRange range : joystickDevice.getMotionRanges()) {
>-                     if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>-                        joystick.axes.add(range);
>-                     }
>+                    if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                       if ((range.getAxis() == MotionEvent.AXIS_HAT_X) || (range.getAxis() == MotionEvent.AXIS_HAT_Y)) {
>+                           joystick.hasHat = true;
>+                       } else {
>+                           joystick.axes.add(range);
>+                       }
>+                    }
>                 }
>                 
>                 mJoysticks.add(joystick);
>@@ -903,6 +918,11 @@
>     }
>     
>     @Override
>+    public int getJoystickHats(int joy) {
>+        return mJoysticks.get(joy).hasHat ? 1 : 0;
>+    }
>+    
>+    @Override
>     public int getJoyId(int devId) {
>         for(int i=0; i < mJoysticks.size(); i++) {
>             if (mJoysticks.get(i).id == devId) {
>@@ -927,7 +947,11 @@
>                             /* Normalize the value to -1...1 */
>                             float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
>                             SDLActivity.onNativeJoy(id, i, value );
>-                        }                       
>+                        }
>+                        if (joystick.hasHat) {
>+                            /* Convert to integers */
>+                            SDLActivity.onNativeHat(id, Math.round(event.getAxisValue( MotionEvent.AXIS_HAT_X, actionPointerIndex)), Math.round(event.getAxisValue( MotionEvent.AXIS_HAT_Y, actionPointerIndex)));
>+                        }
>                     }
>                     break;
>                 default:
>diff -r 965b7e09c5a8 src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c	Mon Nov 11 10:15:35 2013 -0300
>+++ b/src/core/android/SDL_android.c	Tue Nov 12 13:35:49 2013 +0200
>@@ -171,6 +171,14 @@
>     Android_OnJoy(joyId, axis, value);
> }
> 
>+/* POV Hat */
>+void Java_org_libsdl_app_SDLActivity_onNativeHat(
>+                                    JNIEnv* env, jclass jcls,
>+                                    jint joyId, jint x, jint y)
>+{
>+    Android_OnHat(joyId, x, y);
>+}
>+
> 
> /* Surface Created */
> void Java_org_libsdl_app_SDLActivity_onNativeSurfaceChanged(JNIEnv* env, jclass jcls)
>@@ -1299,6 +1307,21 @@
>     return (int)(*env)->CallIntMethod(env, mActivityClass, mid, joy);
> }
> 
>+/* return the number of POV hats in the given joystick */
>+int Android_JNI_GetJoystickHats(int joy)
>+{
>+    JNIEnv* env = Android_JNI_GetEnv();
>+    if (!env) {
>+        return -1;
>+    }
>+    
>+    jmethodID mid = (*env)->GetStaticMethodID(env, mActivityClass, "getJoystickHats", "(I)I");
>+    if (!mid) {
>+        return -1;
>+    }
>+    
>+    return (int)(*env)->CallIntMethod(env, mActivityClass, mid, joy);
>+}
> 
> /* sends message to be handled on the UI event dispatch thread */
> int Android_JNI_SendMessage(int command, int param)
>diff -r 965b7e09c5a8 src/core/android/SDL_android.h
>--- a/src/core/android/SDL_android.h	Mon Nov 11 10:15:35 2013 -0300
>+++ b/src/core/android/SDL_android.h	Tue Nov 12 13:35:49 2013 +0200
>@@ -69,6 +69,7 @@
> int Android_JNI_GetNumJoysticks();
> char* Android_JNI_GetJoystickName(int i);
> int Android_JNI_GetJoystickAxes(int joy);
>+int Android_JNI_GetJoystickHats(int joy);
> 
> /* Touch support */
> int Android_JNI_GetTouchDeviceIds(int **ids);
>diff -r 965b7e09c5a8 src/joystick/android/SDL_sysjoystick.c
>--- a/src/joystick/android/SDL_sysjoystick.c	Mon Nov 11 10:15:35 2013 -0300
>+++ b/src/joystick/android/SDL_sysjoystick.c	Tue Nov 12 13:35:49 2013 +0200
>@@ -224,15 +224,16 @@
> SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
> {
>     if (device_index < SYS_numjoysticks) {
>-        joystick->nhats = 0;
>         joystick->nballs = 0;
>         if (SYS_accelAsJoy && device_index == ANDROID_ACCELEROMETER_INDEX) {
>             joystick->nbuttons = 0;
>             joystick->naxes = 3;
>+            joystick->nhats = 0;
>         } else {
>             /* FIXME: Get the real number of buttons in the device? */
>             joystick->nbuttons = ANDROID_MAX_NBUTTONS;
>             joystick->naxes = Android_JNI_GetJoystickAxes(device_index);
>+            joystick->nhats = Android_JNI_GetJoystickHats(device_index);
>         }
>         
>         SYS_Joysticks[device_index] = joystick;
>@@ -337,6 +338,17 @@
>     return 0;
> }
> 
>+int
>+Android_OnHat(int joyId, int x, int y)
>+{
>+    const Uint8 position_map[3][3] = {
>+        {SDL_HAT_LEFTUP, SDL_HAT_UP, SDL_HAT_RIGHTUP},
>+        {SDL_HAT_LEFT, SDL_HAT_CENTERED, SDL_HAT_RIGHT},
>+        {SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN}
>+    };
>+    SDL_PrivateJoystickHat(SYS_Joysticks[joyId], 0, position_map[y+1][x+1] );
>+}
>+
> #endif /* SDL_JOYSTICK_ANDROID */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff -r 965b7e09c5a8 src/joystick/android/SDL_sysjoystick.h
>--- a/src/joystick/android/SDL_sysjoystick.h	Mon Nov 11 10:15:35 2013 -0300
>+++ b/src/joystick/android/SDL_sysjoystick.h	Tue Nov 12 13:35:49 2013 +0200
>@@ -24,5 +24,6 @@
> extern int Android_OnPadDown(int padId, int keycode);
> extern int Android_OnPadUp(int padId, int keycode);
> extern int Android_OnJoy(int joyId, int axisnum, float value);
>+extern int Android_OnHat(int joyId, int x, int y);
> 
> /* vi: set ts=4 sw=4 expandtab: */

Actions: View | Diff

Attachments on bug 2229: 1422 | 1535 | 1541 | 1543

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.