From fdbcb421c2414e7cfe1509df2c50ef8c3dfe2362 Mon Sep 17 00:00:00 2001 From: Bob the Hamster Date: Fri, 19 Jul 2013 09:59:33 -0700 Subject: [PATCH] Also allow remap of Left and Right Thumb buttons (analog stick clicks) --- project/jni/sdl-1.2/include/SDL_screenkeyboard.h | 2 ++ project/jni/sdl-1.2/src/video/android/SDL_androidinput.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/project/jni/sdl-1.2/include/SDL_screenkeyboard.h b/project/jni/sdl-1.2/include/SDL_screenkeyboard.h index b2d14d679..2bfaae789 100644 --- a/project/jni/sdl-1.2/include/SDL_screenkeyboard.h +++ b/project/jni/sdl-1.2/include/SDL_screenkeyboard.h @@ -128,6 +128,8 @@ extern DECLSPEC int SDLCALL SDL_ToggleScreenKeyboard(void *unused); extern DECLSPEC int SDLCALL SDL_IsScreenKeyboardShown(void *unused); +extern DECLSPEC void SDLCALL SDL_ANDROID_set_java_gamepad_keymap(int A, int B, int C, int X, int Y, int Z, int L1, int R1, int L2, int R2, int LT, int RT); + #ifdef __cplusplus } #endif diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c index 6233a3769..b824300b8 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c @@ -1475,7 +1475,7 @@ JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv* env, jobject thiz ) SDL_android_init_keymap(SDL_android_keymap); } -void SDL_ANDROID_set_java_gamepad_keymap(int A, int B, int C, int X, int Y, int Z, int L1, int R1, int L2, int R2) +void SDL_ANDROID_set_java_gamepad_keymap(int A, int B, int C, int X, int Y, int Z, int L1, int R1, int L2, int R2, int LT, int RT) { /* Arguments are SDL keycodes. Use the SDLK_ constants. @@ -1497,4 +1497,6 @@ void SDL_ANDROID_set_java_gamepad_keymap(int A, int B, int C, int X, int Y, int if (R1) SDL_android_keymap[KEYCODE_BUTTON_R1] = R1; if (L2) SDL_android_keymap[KEYCODE_BUTTON_L2] = L2; if (R2) SDL_android_keymap[KEYCODE_BUTTON_R2] = R2; + if (LT) SDL_android_keymap[KEYCODE_BUTTON_THUMBL] = LT; + if (RT) SDL_android_keymap[KEYCODE_BUTTON_THUMBR] = RT; }