libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 02:30:35 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(BlackBerry) A couple tweaks and fixes for controllers.

Browse Source
This commit is contained in:
CatalystG 2013-06-12 20:32:41 -04:00
parent d5775ea531
commit 7b718cd0f3
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blackberry-qnx/bb10/assets/Controllers.qml
View File

@ -34,7 +34,7 @@ Page
ActionItem {
title: "Rescan"
ActionBar.placement: ActionBarPlacement.OnBar
imageSource: "asset:///images/open.png"
imageSource: "asset:///images/search.png"
onTriggered: {
RetroArch.discoverController();
}
@ -45,7 +45,7 @@ Page
{
Container
{
preferredWidth: 600
preferredWidth: 650
horizontalAlignment: HorizontalAlignment.Center
DropDown

2
blackberry-qnx/bb10/src/RetroArch-Cascades.cpp
View File

@ -360,7 +360,7 @@ void RetroArch::findDevices()
deviceSelection->add(tmp);
//QML shows player 1 by default, so set dropdown to their controller.
if(devices[i].port == 0)
if(devices[i].port == 0 || devices[i].device == DEVICE_KEYPAD)
{
deviceSelection->setSelectedIndex(i);
}

7
blackberry-qnx/qnx_input.c
View File

@ -201,8 +201,8 @@ static void qnx_input_autodetect_gamepad(input_device_t* controller)
}
else if (strstr(controller->id, "BB-VKB"))
{
controller->device = DEVICE_KEYBOARD;
strlcpy(controller->device_name, "BlackBerry Virtual Keyboard", sizeof(controller->device_name));
controller->device = DEVICE_NONE;
strlcpy(controller->device_name, "None", sizeof(controller->device_name));
}
else if (controller->id[0])
{
@ -275,7 +275,8 @@ static void process_keyboard_event(screen_event_t event, int type)
//TODO: Am I missing something? Is there a better way?
if((controller->port == 0) && ((unsigned int)g_settings.input.binds[0][RARCH_MENU_TOGGLE].joykey == (unsigned int)(sym&0xFF)))
g_extern.lifecycle_state ^= (1ULL << RARCH_MENU_TOGGLE);
if (flags & KEY_DOWN)
g_extern.lifecycle_state ^= (1ULL << RARCH_MENU_TOGGLE);
}
static void process_touch_event(screen_event_t event, int type)