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 to get the descriptor for the device.

8126.patch (text/plain), 7.72 KB, created by David Brady on 2014-01-24 03:26:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Brady

Created: 2014-01-24 03:26:05 UTC

Size: 7.72 KB

patch

obsolete

># HG changeset patch
># User dbrady <dbrady@telltalegames.com>
># Date 1390533767 28800
>#      Thu Jan 23 19:22:47 2014 -0800
># Node ID f58bc8ca101e31c4b822e683aae1ef0f68d9cee6
># Parent  c7879637ceec1f6c81dd07fa2635465e323a3da9
>Get actual device descriptor for gamepads on supported phones.
>
>diff -r c7879637ceec -r f58bc8ca101e android-project/src/org/libsdl/app/SDLActivity.java
>--- a/android-project/src/org/libsdl/app/SDLActivity.java	Thu Jan 23 10:50:27 2014 -0800
>+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Thu Jan 23 19:22:47 2014 -0800
>@@ -2,6 +2,8 @@
> 
> import java.util.ArrayList;
> import java.util.Arrays;
>+import java.lang.reflect.InvocationTargetException;
>+import java.lang.reflect.Method;
> import java.util.Collections;
> import java.util.Comparator;
> 
>@@ -274,7 +276,7 @@
>     public static native void onNativeSurfaceChanged();
>     public static native void onNativeSurfaceDestroyed();
>     public static native void nativeFlipBuffers();
>-    public static native int nativeAddJoystick(int device_id, String name, 
>+    public static native int nativeAddJoystick(int device_id, String name, String desc,
>                                                int is_accelerometer, int nbuttons, 
>                                                int naxes, int nhats, int nballs);
>     public static native int nativeRemoveJoystick(int device_id);
>@@ -816,6 +818,31 @@
> 
>         return false;
>     }
>+    
>+    protected String getJoystickDescriptor(InputDevice device) {
>+        Method getDescriptor = null;
>+        String descriptor = null;
>+        try {
>+            getDescriptor = InputDevice.class.getMethod("getDescriptor");
>+        } catch (SecurityException e) {
>+        } catch (NoSuchMethodException e) {
>+        }
>+        if(getDescriptor != null)
>+        {
>+            try {
>+                descriptor = (String) getDescriptor.invoke(device);
>+                return descriptor;
>+            } catch (IllegalArgumentException e) {
>+                e.printStackTrace();
>+            } catch (IllegalAccessException e) {
>+                e.printStackTrace();
>+            } catch (InvocationTargetException e) {
>+                e.printStackTrace();
>+            }
>+        }
>+        descriptor = device.getName();
>+        return descriptor;
>+    }
>         
>     //
>     @Override
>@@ -924,6 +951,7 @@
>     class SDLJoystick {
>         public int device_id;
>         public String name;
>+        public String desc;
>         public ArrayList<InputDevice.MotionRange> axes;
>         public ArrayList<InputDevice.MotionRange> hats;
>     }
>@@ -941,6 +969,31 @@
>        
>         mJoysticks = new ArrayList<SDLJoystick>();
>     }
>+    
>+    protected String getJoystickDescriptor(InputDevice device) {
>+        Method getDescriptor = null;
>+        String descriptor = null;
>+        try {
>+            getDescriptor = InputDevice.class.getMethod("getDescriptor");
>+        } catch (SecurityException e) {
>+        } catch (NoSuchMethodException e) {
>+        }
>+        if(getDescriptor != null)
>+        {
>+            try {
>+                descriptor = (String) getDescriptor.invoke(device);
>+                return descriptor;
>+            } catch (IllegalArgumentException e) {
>+                e.printStackTrace();
>+            } catch (IllegalAccessException e) {
>+                e.printStackTrace();
>+            } catch (InvocationTargetException e) {
>+                e.printStackTrace();
>+            }
>+        }
>+        descriptor = device.getName();
>+        return descriptor;
>+    }
> 
>     @Override
>     public void pollInputDevices() {
>@@ -958,6 +1011,7 @@
>                 if( (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>                     joystick.device_id = deviceIds[i];
>                     joystick.name = joystickDevice.getName();
>+                    joystick.desc = getJoystickDescriptor(joystickDevice);
>                     joystick.axes = new ArrayList<InputDevice.MotionRange>();
>                     joystick.hats = new ArrayList<InputDevice.MotionRange>();
>                     
>@@ -976,7 +1030,7 @@
>                     }
>                     
>                     mJoysticks.add(joystick);
>-                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, 
>+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc, 0, -1, 
>                                                   joystick.axes.size(), joystick.hats.size(), 0);
>                 }
>             }
>diff -r c7879637ceec -r f58bc8ca101e src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c	Thu Jan 23 10:50:27 2014 -0800
>+++ b/src/core/android/SDL_android.c	Thu Jan 23 19:22:47 2014 -0800
>@@ -182,15 +182,17 @@
> 
> 
> int Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
>-    JNIEnv* env, jclass jcls,
>-    jint device_id, jstring device_name, jint is_accelerometer, 
>+    JNIEnv* env, jclass jcls, jint device_id,
>+    jstring device_name, jstring desc, jint is_accelerometer,
>     jint nbuttons, jint naxes, jint nhats, jint nballs)
> {
>     int retval;
>     const char *name = (*env)->GetStringUTFChars(env, device_name, NULL);
>+    const char *descriptor = (*env)->GetStringUTFChars(env, desc, NULL);
> 
>-    retval = Android_AddJoystick(device_id, name, (SDL_bool) is_accelerometer, nbuttons, naxes, nhats, nballs);
>+    retval = Android_AddJoystick(device_id, name, descriptor, (SDL_bool) is_accelerometer, nbuttons, naxes, nhats, nballs);
> 
>+    (*env)->ReleaseStringUTFChars(env, desc, descriptor);
>     (*env)->ReleaseStringUTFChars(env, device_name, name);
>     
>     return retval;
>diff -r c7879637ceec -r f58bc8ca101e src/joystick/android/SDL_sysjoystick.c
>--- a/src/joystick/android/SDL_sysjoystick.c	Thu Jan 23 10:50:27 2014 -0800
>+++ b/src/joystick/android/SDL_sysjoystick.c	Thu Jan 23 19:22:47 2014 -0800
>@@ -245,7 +245,7 @@
> 
> 
> int
>-Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs)
>+Android_AddJoystick(int device_id, const char *name, const char* desc, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs)
> {
>     SDL_JoystickGUID guid;
>     SDL_joylist_item *item;
>@@ -259,7 +259,7 @@
>     
>     /* the GUID is just the first 16 chars of the name for now */
>     SDL_zero( guid );
>-    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
>+    SDL_memcpy( &guid, desc, SDL_min( sizeof(guid), SDL_strlen( desc ) ) );
> 
>     item = (SDL_joylist_item *) SDL_malloc(sizeof (SDL_joylist_item));
>     if (item == NULL) {
>@@ -382,7 +382,7 @@
>     env = SDL_GetHint(SDL_HINT_ACCEL_AS_JOY);
>     if (!env || SDL_atoi(env)) {
>         /* Default behavior, accelerometer as joystick */
>-        Android_AddJoystick(ANDROID_ACCELEROMETER_DEVICE_ID, ANDROID_ACCELEROMETER_NAME, SDL_TRUE, 0, 3, 0, 0);
>+        Android_AddJoystick(ANDROID_ACCELEROMETER_DEVICE_ID, ANDROID_ACCELEROMETER_NAME, ANDROID_ACCELEROMETER_NAME, SDL_TRUE, 0, 3, 0, 0);
>     }
>    
>     return (numjoysticks);
>diff -r c7879637ceec -r f58bc8ca101e src/joystick/android/SDL_sysjoystick_c.h
>--- a/src/joystick/android/SDL_sysjoystick_c.h	Thu Jan 23 10:50:27 2014 -0800
>+++ b/src/joystick/android/SDL_sysjoystick_c.h	Thu Jan 23 19:22:47 2014 -0800
>@@ -28,7 +28,7 @@
> extern int Android_OnPadUp(int device_id, int keycode);
> extern int Android_OnJoy(int device_id, int axisnum, float value);
> extern int Android_OnHat(int device_id, int hat_id, int x, int y);
>-extern int Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs);
>+extern int Android_AddJoystick(int device_id, const char *name, const char* desc, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs);
> extern int Android_RemoveJoystick(int device_id);
> 
> /* A linked list of available joysticks */

Actions: View

Attachments on bug 2361: 1536 | 2897

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.