ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Android) Volume keys work again with new input code - most 

bound keyboard shortcuts should work now
This commit is contained in:
twinaphex 2012-12-16 03:03:44 +01:00
parent cf539edf91
commit c54d4a6955
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
android/native/jni/input_android.c
View File

@ -276,11 +276,14 @@ static void android_input_poll(void *data)
struct android_app* android_app = g_android.app; struct android_app* android_app = g_android.app;
g_extern.lifecycle_state &= ~((1ULL << RARCH_RESET) | (1ULL << RARCH_REWIND) | (1ULL << RARCH_FAST_FORWARD_KEY) | (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_MUTE) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS));
// Read all pending events. // Read all pending events.
while(AInputQueue_hasEvents(android_app->inputQueue)) while(AInputQueue_hasEvents(android_app->inputQueue))
{ {
AInputEvent* event = NULL; AInputEvent* event = NULL;
AInputQueue_getEvent(android_app->inputQueue, &event); AInputQueue_getEvent(android_app->inputQueue, &event);
int32_t handled = 1; int32_t handled = 1;
int id = AInputEvent_getDeviceId(event); int id = AInputEvent_getDeviceId(event);
@ -315,20 +318,24 @@ static void android_input_poll(void *data)
#ifdef RARCH_INPUT_DEBUG #ifdef RARCH_INPUT_DEBUG
RARCH_LOG("Keycode RetroPad %d : %d.\n", i, keycode); RARCH_LOG("Keycode RetroPad %d : %d.\n", i, keycode);
#endif #endif
if(input_state < (1ULL << RARCH_FIRST_META_KEY)) int action = AKeyEvent_getAction(event);
{ uint64_t *key = NULL;
int action = AKeyEvent_getAction(event);
if(action == AKEY_EVENT_ACTION_DOWN) if(input_state < (1ULL << RARCH_FIRST_META_KEY))
state[i] |= input_state; key = &state[i];
else if(action == AKEY_EVENT_ACTION_UP)
state[i] &= ~(input_state);
}
else if(input_state != -1) else if(input_state != -1)
key = &g_extern.lifecycle_state;
if(key != NULL)
{ {
g_extern.lifecycle_state = input_state; if(action == AKEY_EVENT_ACTION_DOWN)
handled = 0; *key |= input_state;
else if(action == AKEY_EVENT_ACTION_UP)
*key &= ~(input_state);
} }
if(keycode == AKEYCODE_VOLUME_UP || keycode == AKEYCODE_VOLUME_DOWN || input_state != -1)
handled = 0;
} }
AInputQueue_finishEvent(android_app->inputQueue, event, handled); AInputQueue_finishEvent(android_app->inputQueue, event, handled);
} }