Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- revert android gamepad log change for mergable x11 fixes

Browse Source
This commit is contained in:
Rolzad73
2017-01-28 04:29:47 -05:00
parent 85f66a8fec
commit f31d5c04c8
2 changed files with 2 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JGE/Dependencies/SDL/src/video/android/SDL_androidkeyboard.c
View File

@@ -160,8 +160,6 @@ TranslateKeycode(int keycode)
} }
if (scancode == SDL_SCANCODE_UNKNOWN) { if (scancode == SDL_SCANCODE_UNKNOWN) {
__android_log_print(ANDROID_LOG_INFO, "SDL", "Unknown keycode %d", keycode); __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; return scancode;
} }

50
projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
View File

@@ -1227,58 +1227,12 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, View.OnK
if (event.getAction() == KeyEvent.ACTION_DOWN) 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); SDLActivity.onNativeKeyDown(keyCode);
return true; return true;
} else if (event.getAction() == KeyEvent.ACTION_UP) } 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); SDLActivity.onNativeKeyUp(keyCode);
return true; return true;
} }