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] android-haptic-support.patch

android-haptic-support.patch (text/plain), 11.20 KB, created by Milan Nikolic on 2016-05-05 21:17:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Nikolic

Created: 2016-05-05 21:17:43 UTC

Size: 11.20 KB

patch

obsolete

>diff -ur SDL2.orig/Android.mk SDL2/Android.mk
>--- SDL2.orig/Android.mk	2016-05-03 22:47:05.000000000 +0200
>+++ SDL2/Android.mk	2016-05-05 21:34:18.000000000 +0200
>@@ -28,7 +28,7 @@
> 	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
> 	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
> 	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
>-	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/android/*.c) \
> 	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
> 	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
> 	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
>diff -ur SDL2.orig/android-project/AndroidManifest.xml SDL2/android-project/AndroidManifest.xml
>--- SDL2.orig/android-project/AndroidManifest.xml	2016-04-25 14:35:22.000000000 +0200
>+++ SDL2/android-project/AndroidManifest.xml	2016-05-05 19:40:21.000000000 +0200
>@@ -16,6 +16,8 @@
> 
>     
>     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
>+    
>+    <uses-permission android:name="android.permission.VIBRATE" />
> 
>     <!-- Create a Java class extending SDLActivity and place it in a
>          directory under src matching the package, e.g.
>diff -ur SDL2.orig/android-project/src/org/libsdl/app/SDLActivity.java SDL2/android-project/src/org/libsdl/app/SDLActivity.java
>--- SDL2.orig/android-project/src/org/libsdl/app/SDLActivity.java	2016-04-25 14:35:22.000000000 +0200
>+++ SDL2/android-project/src/org/libsdl/app/SDLActivity.java	2016-05-05 19:48:26.000000000 +0200
>@@ -53,6 +53,7 @@
>     protected static View mTextEdit;
>     protected static ViewGroup mLayout;
>     protected static SDLJoystickHandler mJoystickHandler;
>+    protected static SDLHapticHandler mHapticHandler;
> 
>     // This is what SDL runs in. It invokes SDL_main(), eventually
>     protected static Thread mSDLThread;
>@@ -104,6 +105,7 @@
>         mTextEdit = null;
>         mLayout = null;
>         mJoystickHandler = null;
>+        mHapticHandler = null;
>         mSDLThread = null;
>         mAudioTrack = null;
>         mExitCalledFromJava = false;
>@@ -170,6 +172,7 @@
>         else {
>             mJoystickHandler = new SDLJoystickHandler();
>         }
>+        mHapticHandler = new SDLHapticHandler();
> 
>         mLayout = new AbsoluteLayout(this);
>         mLayout.addView(mSurface);
>@@ -432,6 +435,8 @@
>                                                int is_accelerometer, int nbuttons,
>                                                int naxes, int nhats, int nballs);
>     public static native int nativeRemoveJoystick(int device_id);
>+    public static native int nativeAddHaptic(int device_id, String name);
>+    public static native int nativeRemoveHaptic(int device_id);
>     public static native String nativeGetHint(String name);
> 
>     /**
>@@ -1600,6 +1605,18 @@
>         return null;
>     }
> 
>+    public static void pollHapticDevices() {
>+        if (SDLActivity.mSDLThread != null) {
>+            mHapticHandler.pollHapticDevices();
>+        }
>+    }
>+
>+    public static void hapticRun(int device_id, int length) {
>+        if (SDLActivity.mSDLThread != null) {
>+            mHapticHandler.run(device_id, length);
>+        }
>+    }
>+
>     @Override
>     public boolean handleMotionEvent(MotionEvent event) {
>         if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
>@@ -1672,3 +1689,82 @@
>         return false;
>     }
> }
>+
>+class SDLHapticHandler {
>+
>+    class SDLHaptic {
>+        public int device_id;
>+        public String name;
>+        public Vibrator vib;
>+    }
>+
>+    private ArrayList<SDLHaptic> mHaptics;
>+    
>+    public SDLHapticHandler() {
>+        mHaptics = new ArrayList<SDLHaptic>();
>+    }
>+
>+    public void run(int device_id, int length) {
>+        SDLHaptic haptic = getHaptic(device_id);
>+        if (haptic != null) {
>+            haptic.vib.vibrate (length);
>+        }
>+    }
>+
>+    public void pollHapticDevices() {
>+        int[] deviceIds = InputDevice.getDeviceIds();
>+        // It helps processing the device ids in reverse order
>+        // For example, in the case of the XBox 360 wireless dongle,
>+        // so the first controller seen by SDL matches what the receiver
>+        // considers to be the first controller
>+
>+        for(int i=deviceIds.length-1; i>-1; i--) {
>+            SDLHaptic haptic = getHaptic(deviceIds[i]);
>+            if (haptic == null) {
>+                InputDevice device = InputDevice.getDevice(deviceIds[i]);
>+                Vibrator vib = device.getVibrator ();
>+                if(vib.hasVibrator ()) {
>+                    haptic = new SDLHaptic();
>+                    haptic.device_id = deviceIds[i];
>+                    haptic.name = device.getName();
>+                    haptic.vib = vib;
>+                    mHaptics.add(haptic);
>+                    SDLActivity.nativeAddHaptic(haptic.device_id, haptic.name);
>+                }
>+            }
>+        }
>+
>+        /* Check removed devices */
>+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
>+        for(int i=0; i < mHaptics.size(); i++) {
>+            int device_id = mHaptics.get(i).device_id;
>+            int j;
>+            for (j=0; j < deviceIds.length; j++) {
>+                if (device_id == deviceIds[j]) break;
>+            }
>+            if (j == deviceIds.length) {
>+                removedDevices.add(device_id);
>+            }
>+        }
>+
>+        for(int i=0; i < removedDevices.size(); i++) {
>+            int device_id = removedDevices.get(i);
>+            SDLActivity.nativeRemoveHaptic(device_id);
>+            for (int j=0; j < mHaptics.size(); j++) {
>+                if (mHaptics.get(j).device_id == device_id) {
>+                    mHaptics.remove(j);
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+
>+    protected SDLHaptic getHaptic(int device_id) {
>+        for(int i=0; i < mHaptics.size(); i++) {
>+            if (mHaptics.get(i).device_id == device_id) {
>+                return mHaptics.get(i);
>+            }
>+        }
>+        return null;
>+    }   
>+}
>diff -ur SDL2.orig/include/SDL_config_android.h SDL2/include/SDL_config_android.h
>--- SDL2.orig/include/SDL_config_android.h	2016-04-25 14:35:23.000000000 +0200
>+++ SDL2/include/SDL_config_android.h	2016-05-05 23:04:18.762981949 +0200
>@@ -114,7 +114,7 @@
> 
> /* Enable various input drivers */
> #define SDL_JOYSTICK_ANDROID    1
>-#define SDL_HAPTIC_DUMMY    1
>+#define SDL_HAPTIC_ANDROID    1
> 
> /* Enable various shared object loading systems */
> #define SDL_LOADSO_DLOPEN   1
>diff -ur SDL2.orig/src/core/android/SDL_android.c SDL2/src/core/android/SDL_android.c
>--- SDL2.orig/src/core/android/SDL_android.c	2016-04-25 14:35:22.000000000 +0200
>+++ SDL2/src/core/android/SDL_android.c	2016-05-05 21:09:24.000000000 +0200
>@@ -37,6 +37,7 @@
> #include "../../video/android/SDL_androidvideo.h"
> #include "../../video/android/SDL_androidwindow.h"
> #include "../../joystick/android/SDL_sysjoystick_c.h"
>+#include "../../haptic/android/SDL_syshaptic_c.h"
> 
> #include <android/log.h>
> #include <pthread.h>
>@@ -76,6 +77,8 @@
> static jmethodID midAudioWriteByteBuffer;
> static jmethodID midAudioQuit;
> static jmethodID midPollInputDevices;
>+static jmethodID midPollHapticDevices;
>+static jmethodID midHapticRun;
> 
> /* Accelerometer data storage */
> static float fLastAccelerometer[3];
>@@ -128,11 +131,15 @@
>                                 "audioQuit", "()V");
>     midPollInputDevices = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
>                                 "pollInputDevices", "()V");
>+    midPollHapticDevices = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
>+                                "pollHapticDevices", "()V");
>+    midHapticRun = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
>+                                "hapticRun", "(II)V");
> 
>     bHasNewData = SDL_FALSE;
> 
>     if (!midGetNativeSurface || !midAudioInit ||
>-       !midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit || !midPollInputDevices) {
>+       !midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit || !midPollInputDevices || !midPollHapticDevices || !midHapticRun) {
>         __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL: Couldn't locate Java callbacks, check that they're named and typed correctly");
>     }
>     __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init() finished!");
>@@ -211,6 +218,25 @@
>     return Android_RemoveJoystick(device_id);
> }
> 
>+JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_nativeAddHaptic(
>+    JNIEnv* env, jclass jcls, jint device_id, jstring device_name)
>+{
>+    int retval;
>+    const char *name = (*env)->GetStringUTFChars(env, device_name, NULL);
>+
>+    retval = Android_AddHaptic(device_id, name);
>+
>+    (*env)->ReleaseStringUTFChars(env, device_name, name);
>+
>+    return retval;
>+}
>+
>+JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_nativeRemoveHaptic(
>+    JNIEnv* env, jclass jcls, jint device_id)
>+{
>+    return Android_RemoveHaptic(device_id);
>+}
>+
> 
> /* Surface Created */
> JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeSurfaceChanged(JNIEnv* env, jclass jcls)
>@@ -1368,6 +1394,19 @@
>     (*env)->CallStaticVoidMethod(env, mActivityClass, midPollInputDevices);    
> }
> 
>+void Android_JNI_PollHapticDevices(void)
>+{
>+    JNIEnv *env = Android_JNI_GetEnv();
>+    (*env)->CallStaticVoidMethod(env, mActivityClass, midPollHapticDevices);
>+}
>+    
>+void Android_JNI_HapticRun(int device_id, int length)
>+{
>+    JNIEnv *env = Android_JNI_GetEnv();
>+    (*env)->CallStaticVoidMethod(env, mActivityClass, midHapticRun, device_id, length);
>+}
>+
>+
> /* See SDLActivity.java for constants. */
> #define COMMAND_SET_KEEP_SCREEN_ON    5
> 
>diff -ur SDL2.orig/src/core/android/SDL_android.h SDL2/src/core/android/SDL_android.h
>--- SDL2.orig/src/core/android/SDL_android.h	2016-04-25 14:35:22.000000000 +0200
>+++ SDL2/src/core/android/SDL_android.h	2016-05-05 20:54:52.000000000 +0200
>@@ -65,6 +65,10 @@
> /* Joystick support */
> void Android_JNI_PollInputDevices(void);
> 
>+/* Haptic support */
>+void Android_JNI_PollHapticDevices(void);
>+void Android_JNI_HapticRun(int device_id, int length);
>+
> /* Video */
> void Android_JNI_SuspendScreenSaver(SDL_bool suspend);
> 
>Only in SDL2/src/haptic: android
>diff -ur SDL2.orig/src/haptic/SDL_haptic.c SDL2/src/haptic/SDL_haptic.c
>--- SDL2.orig/src/haptic/SDL_haptic.c	2016-04-25 14:35:22.000000000 +0200
>+++ SDL2/src/haptic/SDL_haptic.c	2016-05-05 20:01:32.000000000 +0200
>@@ -313,6 +313,7 @@
>     SDL_memset(haptic, 0, sizeof(SDL_Haptic));
>     haptic->rumble_id = -1;
>     if (SDL_SYS_HapticOpenFromJoystick(haptic, joystick) < 0) {
>+        SDL_SetError("Haptic: SDL_SYS_HapticOpenFromJoystick failed.");
>         SDL_free(haptic);
>         return NULL;
>     }
>diff -ur SDL2.orig/src/joystick/android/SDL_sysjoystick_c.h SDL2/src/joystick/android/SDL_sysjoystick_c.h
>--- SDL2.orig/src/joystick/android/SDL_sysjoystick_c.h	2016-04-25 14:35:22.000000000 +0200
>+++ SDL2/src/joystick/android/SDL_sysjoystick_c.h	2016-05-05 20:03:45.000000000 +0200
>@@ -22,6 +22,10 @@
> #include "../../SDL_internal.h"
> 
> #ifdef SDL_JOYSTICK_ANDROID
>+
>+#ifndef _SDL_sysjoystick_c_h
>+#define _SDL_sysjoystick_c_h
>+
> #include "../SDL_sysjoystick.h"
> 
> extern int Android_OnPadDown(int device_id, int keycode);
>@@ -47,6 +51,8 @@
> 
> typedef SDL_joylist_item joystick_hwdata;
> 
>+#endif /* _SDL_sysjoystick_c_h */
>+
> #endif /* SDL_JOYSTICK_ANDROID */
> 
> /* vi: set ts=4 sw=4 expandtab: */

Actions: View | Diff

Attachments on bug 3191: 2327 | 2444 | 2445 | 2832 | 2845

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.