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

- created proper branch on separate fork for dev work

Browse Source
This commit is contained in:
Rolzad73
2017-01-27 11:58:59 -05:00
parent e3319f6fe4
commit e3dc78b28e
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/Dependencies/SDL/src/video/android/SDL_androidkeyboard.c
+3
View File
@@ -160,6 +160,8 @@ 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;
} }
@@ -177,3 +179,4 @@ Android_OnKeyUp(int keycode)
} }
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
+49 -2
View File
@@ -1227,12 +1227,58 @@ 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;
} }
@@ -1309,3 +1355,4 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, View.OnK
} }
} }
} }