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

(BlackBerry) Clean up input a bit, fix multiple device issue.

Browse Source
This commit is contained in:
CatalystG 2013-06-11 19:38:10 -04:00
parent e022981b06
commit 4e0e2ff245
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
blackberry-qnx/qnx_input.c
View File

@ -194,6 +194,11 @@ static void qnx_input_autodetect_gamepad(input_device_t* controller)
controller->device = DEVICE_KEYPAD;
strlcpy(controller->device_name, "BlackBerry Q10 Keypad", sizeof(controller->device_name));
}
else if (strstr(controller->id, "BB-VKB"))
{
controller->device = DEVICE_KEYBOARD;
strlcpy(controller->device_name, "BlackBerry Virtual Keyboard", sizeof(controller->device_name));
}
else if (controller->id[0])
{
controller->device = DEVICE_UNKNOWN;
@ -444,7 +449,7 @@ static void *qnx_input_init(void)
for (i = 0; i < MAX_PADS; ++i)
{
initController(&devices[i]);
port_device[i] = (input_device_t*)-1;
port_device[i] = 0;
}
#ifdef HAVE_BB10
//Find currently connected gamepads
@ -494,9 +499,9 @@ static int16_t qnx_input_state(void *data, const struct retro_keybind **retro_ke
switch (device)
{
case RETRO_DEVICE_JOYPAD:
if(port_device[port] != (input_device_t*)-1)
if(port_device[port])
{
if (g_settings.input.device[port] == DEVICE_KEYBOARD || g_settings.input.device[port] == DEVICE_KEYPAD)
if (port_device[port]->device == DEVICE_KEYBOARD || port_device[port]->device == DEVICE_KEYPAD)
return ((port_device[port]->buttons & (1 << id)) && (port < pads_connected) );
else
return ((port_device[port]->buttons & retro_keybinds[port][id].joykey) && (port < pads_connected));
@ -733,7 +738,7 @@ static void qnx_input_set_keybinds(void *data, unsigned device, unsigned port,
g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_L3].def_joykey = 0;
g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_R3].def_joykey = 0;
controller->port = -1;
port_device[port] = -1;
port_device[port] = 0;
break;
#endif
}