mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Input - cleanups

Browse Source
This commit is contained in:
twinaphex 2014-08-13 23:04:59 +02:00
parent 1c35e607b5
commit 9976b4581d
2 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/android_input.c
View File

@ -424,7 +424,7 @@ static void handle_hotplug(android_input_t *android, struct android_app *android
else if (strstr(device_name, "Logitech") && strstr(device_name, "Precision")) else if (strstr(device_name, "Logitech") && strstr(device_name, "Precision"))
strlcpy(name_buf, "Logitech Precision", sizeof(name_buf)); strlcpy(name_buf, "Logitech Precision", sizeof(name_buf));
else if (strstr(device_name, "iControlPad-")) // followed by a 4 (hex) char HW id else if (strstr(device_name, "iControlPad-")) // followed by a 4 (hex) char HW id
device = DEVICE_ICONTROLPAD_HID_JOYSTICK; strlcpy(name_buf, "iControlPad HID Joystick profile", sizeof(name_buf));
else if (strstr(device_name, "TTT THT Arcade console 2P USB Play")) else if (strstr(device_name, "TTT THT Arcade console 2P USB Play"))
{ {
//FIXME - need to do a similar thing here as we did for nVidia Shield //FIXME - need to do a similar thing here as we did for nVidia Shield
@ -547,9 +547,7 @@ static void handle_hotplug(android_input_t *android, struct android_app *android
strlcpy(name_buf, "ccpcreations WiiUse", sizeof(name_buf)); strlcpy(name_buf, "ccpcreations WiiUse", sizeof(name_buf));
} }
else if (strstr(android_app->current_ime, "com.hexad.bluezime")) else if (strstr(android_app->current_ime, "com.hexad.bluezime"))
{
strlcpy(name_buf, "iControlpad SPP mode (using Bluez IME)", sizeof(name_buf)); strlcpy(name_buf, "iControlpad SPP mode (using Bluez IME)", sizeof(name_buf));
}
if (source == AINPUT_SOURCE_KEYBOARD && device != DEVICE_XPERIA_PLAY) if (source == AINPUT_SOURCE_KEYBOARD && device != DEVICE_XPERIA_PLAY)
device = DEVICE_KEYBOARD_RETROPAD; device = DEVICE_KEYBOARD_RETROPAD;

48
input/android_input.c.rem
View File

@ -18,54 +18,6 @@ static void android_input_set_keybinds(void *data, unsigned device,
switch (device) switch (device)
{ {
case DEVICE_ICONTROLPAD_HID_JOYSTICK:
g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "iControlPad HID Joystick profile",
sizeof(g_settings.input.device_names[port]));
android->keycode_lut[188] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift);
android->keycode_lut[191] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift);
android->keycode_lut[190] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift);
android->keycode_lut[189] |= ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1) << shift);
android->keycode_lut[201] |= ((RETRO_DEVICE_ID_JOYPAD_A+1) << shift);
android->keycode_lut[200] |= ((RETRO_DEVICE_ID_JOYPAD_B+1) << shift);
android->keycode_lut[198] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift);
android->keycode_lut[199] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift);
android->keycode_lut[197] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
android->keycode_lut[196] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
android->keycode_lut[192] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift);
android->keycode_lut[202] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift);
break;
case DEVICE_ICONTROLPAD_BLUEZ_IME:
g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "iControlPad SPP profile (using Bluez IME)",
sizeof(g_settings.input.device_names[port]));
android->keycode_lut[19] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift);
android->keycode_lut[20] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift);
android->keycode_lut[21] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift);
android->keycode_lut[22] |= ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1) << shift);
android->keycode_lut[99] |= ((RETRO_DEVICE_ID_JOYPAD_B+1) << shift);
android->keycode_lut[97] |= ((RETRO_DEVICE_ID_JOYPAD_A+1) << shift);
android->keycode_lut[96] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift);
android->keycode_lut[100] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift);
android->keycode_lut[102] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift);
android->keycode_lut[103] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift);
android->keycode_lut[108] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
android->keycode_lut[109] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
/* left analog stick */
android->keycode_lut[51] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift);
android->keycode_lut[47] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift);
android->keycode_lut[29] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift);
android->keycode_lut[32] |= ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1) << shift);
/* right analog stick - TODO */
// Left - 11
// Right - 13
// Down - 12
// Up - 15
break;
case DEVICE_MADCATZ_PC_USB_STICK: case DEVICE_MADCATZ_PC_USB_STICK:
g_settings.input.device[port] = device; g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "Madcatz PC USB Stick", strlcpy(g_settings.input.device_names[port], "Madcatz PC USB Stick",