CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-05 09:57:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Android) Xperia back button fix

Browse Source
This commit is contained in:
ToadKing 2013-02-03 16:48:52 -05:00
parent 71473dad51
commit 514bfdd07d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@
static unsigned pads_connected; static unsigned pads_connected;
static int state_device_ids[MAX_PADS]; static int state_device_ids[MAX_PADS];
static uint64_t state[MAX_PADS]; static uint64_t state[MAX_PADS];
static bool ignore_p1_back;
struct input_pointer struct input_pointer
{ {
@ -131,16 +130,17 @@ static void android_input_poll(void *data)
input_autodetect_setup(android_app, msg, sizeof(msg), state_id, id, source); input_autodetect_setup(android_app, msg, sizeof(msg), state_id, id, source);
long_msg_enable = true; long_msg_enable = true;
if (state_id == 0)
ignore_p1_back = (keycode_lut[AKEYCODE_BACK] != 0);
} }
if (keycode == AKEYCODE_BACK && (!ignore_p1_back || state_id != 0)) if (keycode == AKEYCODE_BACK )
{ {
*lifecycle_state |= (1ULL << RARCH_QUIT_KEY); int meta = AKeyEvent_getMetaState(event);
AInputQueue_finishEvent(android_app->inputQueue, event, handled); if (!(meta & AMETA_ALT_ON))
break; {
*lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
AInputQueue_finishEvent(android_app->inputQueue, event, handled);
break;
}
} }
else if(type_event == AINPUT_EVENT_TYPE_MOTION && (g_settings.input.dpad_emulation[state_id] != DPAD_EMULATION_NONE)) else if(type_event == AINPUT_EVENT_TYPE_MOTION && (g_settings.input.dpad_emulation[state_id] != DPAD_EMULATION_NONE))
{ {