mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-11-28 18:39:43 +01:00
parent b06d08a32e
commit 7856c4e940
2 changed files with 54 additions and 54 deletions

14
input/drivers/android_input.c

@ -291,7 +291,7 @@ error:
return false; return false;
} }
static void engine_handle_cmd(void) static void android_input_poll_main_cmd(void)
{ {
bool is_paused; bool is_paused;
int8_t cmd; int8_t cmd;
@ -786,7 +786,7 @@ static int android_input_get_id(android_input_t *android, AInputEvent *event)
return id; return id;
} }
static void android_input_handle_input(void *data) static void android_input_poll_input(void *data)
{ {
AInputEvent *event = NULL; AInputEvent *event = NULL;
android_input_t *android = (android_input_t*)data; android_input_t *android = (android_input_t*)data;
@ -831,7 +831,7 @@ static void android_input_handle_input(void *data)
} }
} }
static void android_input_handle_user(void *data) static void android_input_poll_user(void *data)
{ {
android_input_t *android = (android_input_t*)data; android_input_t *android = (android_input_t*)data;
struct android_app *android_app = (struct android_app*)g_android; struct android_app *android_app = (struct android_app*)g_android;
@ -870,13 +870,13 @@ static void android_input_poll(void *data)
switch (ident) switch (ident)
{ {
case LOOPER_ID_INPUT: case LOOPER_ID_INPUT:
android_input_handle_input(data); android_input_poll_input(data);
break; break;
case LOOPER_ID_USER: case LOOPER_ID_USER:
android_input_handle_user(data); android_input_poll_user(data);
break; break;
case LOOPER_ID_MAIN: case LOOPER_ID_MAIN:
engine_handle_cmd(); android_input_poll_main_cmd();
break; break;
} }
} }
@ -888,7 +888,7 @@ bool android_run_events(void *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(); android_input_poll_main_cmd();
/* Check if we are exiting. */ /* Check if we are exiting. */
if (system->shutdown) if (system->shutdown)

94
input/drivers/dinput.c

@ -583,62 +583,62 @@ bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lPa
switch (message) switch (message)
{ {
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
di->window_pos_x = GET_X_LPARAM(lParam); di->window_pos_x = GET_X_LPARAM(lParam);
di->window_pos_y = GET_Y_LPARAM(lParam); di->window_pos_y = GET_Y_LPARAM(lParam);
break; break;
case WM_POINTERDOWN: case WM_POINTERDOWN:
{
struct pointer_status *new_pointer =
(struct pointer_status *)malloc(sizeof(struct pointer_status));
if (!new_pointer)
{ {
RARCH_ERR("dinput_handle_message: pointer allocation in WM_POINTERDOWN failed.\n"); struct pointer_status *new_pointer =
return false; (struct pointer_status *)malloc(sizeof(struct pointer_status));
}
new_pointer->pointer_id = GET_POINTERID_WPARAM(wParam); if (!new_pointer)
dinput_pointer_store_pos(new_pointer, lParam); {
dinput_add_pointer(di, new_pointer); RARCH_ERR("dinput_handle_message: pointer allocation in WM_POINTERDOWN failed.\n");
return true; return false;
} }
new_pointer->pointer_id = GET_POINTERID_WPARAM(wParam);
dinput_pointer_store_pos(new_pointer, lParam);
dinput_add_pointer(di, new_pointer);
return true;
}
case WM_POINTERUP: case WM_POINTERUP:
{ {
int pointer_id = GET_POINTERID_WPARAM(wParam); int pointer_id = GET_POINTERID_WPARAM(wParam);
dinput_delete_pointer(di, pointer_id); dinput_delete_pointer(di, pointer_id);
return true; return true;
} }
case WM_POINTERUPDATE: case WM_POINTERUPDATE:
{ {
int pointer_id = GET_POINTERID_WPARAM(wParam); int pointer_id = GET_POINTERID_WPARAM(wParam);
struct pointer_status *pointer = dinput_find_pointer(di, pointer_id); struct pointer_status *pointer = dinput_find_pointer(di, pointer_id);
if (pointer) if (pointer)
dinput_pointer_store_pos(pointer, lParam); dinput_pointer_store_pos(pointer, lParam);
return true; return true;
} }
case WM_DEVICECHANGE: case WM_DEVICECHANGE:
{ {
if (di->joypad) if (di->joypad)
di->joypad->destroy(); di->joypad->destroy();
di->joypad = input_joypad_init_driver(settings->input.joypad_driver, di); di->joypad = input_joypad_init_driver(settings->input.joypad_driver, di);
break; break;
} }
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
{ {
if (((short) HIWORD(wParam))/120 > 0) if (((short) HIWORD(wParam))/120 > 0)
di->mouse_wu = true; di->mouse_wu = true;
if (((short) HIWORD(wParam))/120 < 0) if (((short) HIWORD(wParam))/120 < 0)
di->mouse_wd = true; di->mouse_wd = true;
} }
break; break;
case WM_MOUSEHWHEEL: case WM_MOUSEHWHEEL:
{ {
if (((short) HIWORD(wParam))/120 > 0) if (((short) HIWORD(wParam))/120 > 0)
di->mouse_hwu = true; di->mouse_hwu = true;
if (((short) HIWORD(wParam))/120 < 0) if (((short) HIWORD(wParam))/120 < 0)
di->mouse_hwd = true; di->mouse_hwd = true;
} }
break; break;
} }
return false; return false;