diff --git a/JGE/Dependencies/SDL/src/video/android/SDL_androidkeyboard.c b/JGE/Dependencies/SDL/src/video/android/SDL_androidkeyboard.c index 70e7e7b2f..7601de929 100644 --- a/JGE/Dependencies/SDL/src/video/android/SDL_androidkeyboard.c +++ b/JGE/Dependencies/SDL/src/video/android/SDL_androidkeyboard.c @@ -160,6 +160,8 @@ TranslateKeycode(int keycode) } if (scancode == SDL_SCANCODE_UNKNOWN) { __android_log_print(ANDROID_LOG_INFO, "SDL", "Unknown keycode %d", keycode); + } else { + __android_log_print(ANDROID_LOG_INFO, "SDL", "Trans scancode %d", scancode); } return scancode; } @@ -177,3 +179,4 @@ Android_OnKeyUp(int keycode) } /* vi: set ts=4 sw=4 expandtab: */ + diff --git a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java index 56b644caa..314db5eb3 100644 --- a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java +++ b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java @@ -1227,12 +1227,58 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, View.OnK if (event.getAction() == KeyEvent.ACTION_DOWN) { - // Log.d(TAG, "key down: " + keyCode); + Log.d(TAG, "key down: " + keyCode); + // HACK: keycode translation for GameStick (assuming default key bindings) +// switch(keyCode) { +// case KeyEvent.KEYCODE_BUTTON_A: +// keyCode = KeyEvent.KEYCODE_K; +// break; +// case KeyEvent.KEYCODE_BUTTON_B: +// keyCode = KeyEvent.KEYCODE_L; +// break; +// case KeyEvent.KEYCODE_BUTTON_X: +// keyCode = KeyEvent.KEYCODE_J; +// break; +// case KeyEvent.KEYCODE_BUTTON_Y: +// keyCode = KeyEvent.KEYCODE_I; +// break; +// case KeyEvent.KEYCODE_BUTTON_L1: +// keyCode = KeyEvent.KEYCODE_A; +// break; +// case KeyEvent.KEYCODE_BUTTON_R1: +// keyCode = KeyEvent.KEYCODE_E; +// break; +// } +// Log.d(TAG, "key down: " + keyCode); + SDLActivity.onNativeKeyDown(keyCode); return true; } else if (event.getAction() == KeyEvent.ACTION_UP) { - // Log.d(TAG, "key up: " + keyCode); + Log.d(TAG, "key up: " + keyCode); + // HACK: keycode translation for GameStick (assuming default key bindings) +// switch(keyCode) { +// case KeyEvent.KEYCODE_BUTTON_A: +// keyCode = KeyEvent.KEYCODE_K; +// break; +// case KeyEvent.KEYCODE_BUTTON_B: +// keyCode = KeyEvent.KEYCODE_L; +// break; +// case KeyEvent.KEYCODE_BUTTON_X: +// keyCode = KeyEvent.KEYCODE_J; +// break; +// case KeyEvent.KEYCODE_BUTTON_Y: +// keyCode = KeyEvent.KEYCODE_I; +// break; +// case KeyEvent.KEYCODE_BUTTON_L1: +// keyCode = KeyEvent.KEYCODE_A; +// break; +// case KeyEvent.KEYCODE_BUTTON_R1: +// keyCode = KeyEvent.KEYCODE_E; +// break; +// } +// Log.d(TAG, "key up: " + keyCode); + SDLActivity.onNativeKeyUp(keyCode); return true; } @@ -1309,3 +1355,4 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, View.OnK } } } +