mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Rewrite new input code some more

Browse Source
This commit is contained in:
twinaphex 2013-03-03 11:22:59 +01:00
parent ec114db356
commit 28c9f51913
4 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,9 +46,13 @@ static unsigned pointer_count;
/** /**
* Process the next main command. * Process the next main command.
*/ */
void engine_handle_cmd (void *data, int32_t cmd) void engine_handle_cmd(void)
{ {
struct android_app *android_app = (struct android_app*)data; struct android_app *android_app = (struct android_app*)g_android;
int8_t cmd;
if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd))
cmd = -1;
switch (cmd) switch (cmd)
{ {
@ -162,12 +166,18 @@ void engine_handle_cmd (void *data, int32_t cmd)
g_extern.lifecycle_state |= (1ULL << RARCH_QUIT_KEY); g_extern.lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
break; break;
} }
if (cmd == APP_CMD_INIT_WINDOW)
{
if (g_extern.lifecycle_state & (1ULL << RARCH_PAUSE_TOGGLE))
init_drivers();
}
} }
void engine_handle_input (void *data, int32_t cmd) void engine_handle_input(void)
{ {
bool debug_enable = g_settings.input.debug_enable; bool debug_enable = g_settings.input.debug_enable;
struct android_app *android_app = (struct android_app*)data; struct android_app *android_app = (struct android_app*)g_android;
uint64_t *lifecycle_state = &g_extern.lifecycle_state; uint64_t *lifecycle_state = &g_extern.lifecycle_state;
*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)); *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));

16
frontend/frontend_android.c
View File

@ -61,24 +61,10 @@ static void print_cur_config (void *data)
static bool android_run_events (void *data) static bool android_run_events (void *data)
{ {
struct android_app *android_app = (struct android_app*)data;
int id = ALooper_pollOnce(-1, NULL, NULL, NULL); int id = ALooper_pollOnce(-1, NULL, NULL, NULL);
if (id == LOOPER_ID_MAIN) if (id == LOOPER_ID_MAIN)
{ engine_handle_cmd();
int8_t cmd;
if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd))
cmd = -1;
engine_handle_cmd(android_app, cmd);
if (cmd == APP_CMD_INIT_WINDOW)
{
if (g_extern.lifecycle_state & (1ULL << RARCH_PAUSE_TOGGLE))
init_drivers();
}
}
// Check if we are exiting. // Check if we are exiting.
if (g_extern.lifecycle_state & (1ULL << RARCH_QUIT_KEY)) if (g_extern.lifecycle_state & (1ULL << RARCH_QUIT_KEY))

4
frontend/frontend_android.h
View File

@ -154,8 +154,8 @@ enum {
}; };
int8_t android_app_read_cmd (void *data); int8_t android_app_read_cmd (void *data);
extern void engine_app_read_cmd (void *data); extern void engine_app_read_cmd(void);
extern void engine_handle_cmd (void *data, int32_t cmd); extern void engine_handle_cmd(void);
extern struct android_app *g_android; extern struct android_app *g_android;

18
retroarch.c
View File

@ -2793,28 +2793,14 @@ bool rarch_main_iterate(void)
} }
#ifdef ANDROID #ifdef ANDROID
struct android_app *android_app = (struct android_app*)g_android;
int ident; int ident;
while ((ident = ALooper_pollAll( (input_key_pressed_func(RARCH_PAUSE_TOGGLE)) ? -1 : 0, NULL, NULL, NULL)) >= 0) while ((ident = ALooper_pollAll( (input_key_pressed_func(RARCH_PAUSE_TOGGLE)) ? -1 : 0, NULL, NULL, NULL)) >= 0)
{ {
if (ident == LOOPER_ID_MAIN) if (ident == LOOPER_ID_MAIN)
{ engine_handle_cmd();
int8_t cmd;
if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd))
cmd = -1;
engine_handle_cmd(android_app, cmd);
if (cmd == APP_CMD_INIT_WINDOW)
{
if (g_extern.lifecycle_state & (1ULL << RARCH_PAUSE_TOGGLE))
init_drivers();
}
}
else if (!input_key_pressed_func(RARCH_PAUSE_TOGGLE)) else if (!input_key_pressed_func(RARCH_PAUSE_TOGGLE))
engine_handle_input(android_app, 0); engine_handle_input();
else else
return true; return true;
} }