preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

blackberry: Remove!

Browse Source
This commit is contained in:
Florent Castelli committed 2016-10-11 17:40:32 +02:00
1 parent fef8847a58
commit 373db56a16
47 files changed
+25 -1183
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/KeyMap.cpp
+2 -41
View File
@@ -183,32 +183,8 @@ static const DefMappingStruct defaultShieldKeyMap[] = {
{VIRTKEY_PAUSE, NKCODE_BACK },
};
static const DefMappingStruct defaultBlackberryQWERTYKeyMap[] = {
{CTRL_SQUARE, NKCODE_J},
{CTRL_TRIANGLE, NKCODE_I},
{CTRL_CIRCLE, NKCODE_L},
{CTRL_CROSS, NKCODE_K},
{CTRL_LTRIGGER, NKCODE_Q},
{CTRL_RTRIGGER, NKCODE_W},
{CTRL_START, NKCODE_SPACE},
{CTRL_SELECT, NKCODE_ENTER},
{CTRL_UP , NKCODE_W},
{CTRL_DOWN , NKCODE_S},
{CTRL_LEFT , NKCODE_A},
{CTRL_RIGHT, NKCODE_D},
{VIRTKEY_AXIS_Y_MAX, NKCODE_W},
{VIRTKEY_AXIS_Y_MIN, NKCODE_S},
{VIRTKEY_AXIS_X_MIN, NKCODE_A},
{VIRTKEY_AXIS_X_MAX, NKCODE_D},
{VIRTKEY_RAPID_FIRE , NKCODE_SHIFT_LEFT},
{VIRTKEY_UNTHROTTLE , NKCODE_TAB},
{VIRTKEY_SPEED_TOGGLE, NKCODE_GRAVE},
{VIRTKEY_PAUSE , NKCODE_ESCAPE},
{VIRTKEY_REWIND , NKCODE_DEL},
};
static const DefMappingStruct defaultPadMap[] = {
#if defined(ANDROID) || defined(BLACKBERRY)
#if defined(ANDROID)
{CTRL_CROSS , NKCODE_BUTTON_A},
{CTRL_CIRCLE , NKCODE_BUTTON_B},
{CTRL_SQUARE , NKCODE_BUTTON_X},
@@ -405,10 +381,6 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) {
case DEFAULT_MAPPING_SHIELD:
SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultShieldKeyMap, ARRAY_SIZE(defaultShieldKeyMap), replace);
break;
case DEFAULT_MAPPING_BLACKBERRY_QWERTY:
SetDefaultKeyMap(DEVICE_ID_KEYBOARD, defaultBlackberryQWERTYKeyMap, ARRAY_SIZE(defaultBlackberryQWERTYKeyMap), replace);
replace = false;
// Intentional fallthrough.
case DEFAULT_MAPPING_PAD:
SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultPadMap, ARRAY_SIZE(defaultPadMap), replace);
break;
@@ -875,13 +847,6 @@ void RestoreDefault() {
} else {
SetDefaultKeyMap(DEFAULT_MAPPING_PAD, true);
}
#elif defined(BLACKBERRY)
std::string name = System_GetProperty(SYSPROP_NAME);
if (IsBlackberryQWERTY(name)) {
SetDefaultKeyMap(DEFAULT_MAPPING_BLACKBERRY_QWERTY, true);
} else {
SetDefaultKeyMap(DEFAULT_MAPPING_PAD, true);
}
#else
SetDefaultKeyMap(DEFAULT_MAPPING_KEYBOARD, true);
SetDefaultKeyMap(DEFAULT_MAPPING_PAD, false);
@@ -957,12 +922,8 @@ bool IsXperiaPlay(const std::string &name) {
return name == "Sony Ericsson:R800a" || name == "Sony Ericsson:R800i" || name == "Sony Ericsson:R800x" || name == "Sony Ericsson:R800at" || name == "Sony Ericsson:SO-01D" || name == "Sony Ericsson:zeus";
}
bool IsBlackberryQWERTY(const std::string &name) {
return name == "Blackberry:QWERTY";
}
bool HasBuiltinController(const std::string &name) {
return IsOuya(name) || IsXperiaPlay(name) || IsNvidiaShield(name) || IsBlackberryQWERTY(name);
return IsOuya(name) || IsXperiaPlay(name) || IsNvidiaShield(name);
}
void NotifyPadConnected(const std::string &name) {