mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 05:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Brings up RMenu now for me

Browse Source
This commit is contained in:
twinaphex 2013-03-04 17:26:34 +01:00
parent 5c16cff2e7
commit 2c44563dba
2 changed files with 11 additions and 0 deletions

7
android/native/jni/input_android.c

@ -367,12 +367,14 @@ static void android_input_poll(void *data)
&& input_state > 0) && input_state > 0)
{ {
} }
#if 0
else else
{ {
*lifecycle_state |= (1ULL << RARCH_QUIT_KEY); *lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
AInputQueue_finishEvent(android_app->inputQueue, event, handled); AInputQueue_finishEvent(android_app->inputQueue, event, handled);
break; break;
} }
#endif
} }
if (type_event == AINPUT_EVENT_TYPE_MOTION) if (type_event == AINPUT_EVENT_TYPE_MOTION)
@ -461,6 +463,11 @@ static void android_input_poll(void *data)
else if (ident == LOOPER_ID_MAIN) else if (ident == LOOPER_ID_MAIN)
engine_handle_cmd(); engine_handle_cmd();
} }
if (!(g_extern.frame_count < g_extern.delay_timer[0]) && g_extern.lifecycle_state & (1ULL << RARCH_RMENU_TOGGLE))
{
g_extern.lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
}
} }
static int16_t android_input_state(void *data, const struct retro_keybind **binds, unsigned port, unsigned device, unsigned index, unsigned id) static int16_t android_input_state(void *data, const struct retro_keybind **binds, unsigned port, unsigned device, unsigned index, unsigned id)

4
android/native/jni/input_autodetect.c

@ -139,7 +139,11 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
} }
} }
#if 0
keycode_lut[AKEYCODE_MENU] |= ((RARCH_RMENU_TOGGLE + 1) << shift); keycode_lut[AKEYCODE_MENU] |= ((RARCH_RMENU_TOGGLE + 1) << shift);
#else
keycode_lut[AKEYCODE_BACK] |= ((RARCH_RMENU_TOGGLE + 1) << shift);
#endif
if (g_settings.input.autodetect_enable) if (g_settings.input.autodetect_enable)
{ {