mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-04 02:22:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

hid: Create CONTROLLER_ANY, revise P1_AUTO behavior closer to original

Browse Source
This commit is contained in:
shinyquagsire23 2018-02-23 18:31:23 -07:00
parent ec7055b001
commit 7c363a1054
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nx/include/switch/services/hid.h
View File

@ -310,7 +310,8 @@ typedef enum
CONTROLLER_PLAYER_8 = 7, CONTROLLER_PLAYER_8 = 7,
CONTROLLER_HANDHELD = 8, CONTROLLER_HANDHELD = 8,
CONTROLLER_UNKNOWN = 9, CONTROLLER_UNKNOWN = 9,
CONTROLLER_P1_AUTO = 10, /// Not an actual HID-sysmodule ID. Only for hidKeys*(). Switches the commanding controller based on activity. CONTROLLER_P1_AUTO = 10, /// Not an actual HID-sysmodule ID. Only for hidKeys*(). Switches the commanding controller between handheld and player 1 based on activity.
CONTROLLER_ANY = 11, /// Not an actual HID-sysmodule ID. Only for hidKeys*(). Switches the commanding controller based on activity.
} HidControllerID; } HidControllerID;
typedef struct touchPosition typedef struct touchPosition

39
nx/source/services/hid.c
View File

@ -28,6 +28,8 @@ static u64 g_touchTimestamp, g_mouseTimestamp, g_keyboardTimestamp, g_controller
static HidControllerID g_controllerP1AutoID; static HidControllerID g_controllerP1AutoID;
static HidControllerID g_controllerP1StickAutoID; static HidControllerID g_controllerP1StickAutoID;
static HidControllerID g_controllerAnyID;
static HidControllerID g_controllerStickAnyID;
static RwLock g_hidLock; static RwLock g_hidLock;
@ -106,6 +108,8 @@ void hidReset(void)
g_controllerP1AutoID = CONTROLLER_HANDHELD; g_controllerP1AutoID = CONTROLLER_HANDHELD;
g_controllerP1StickAutoID = CONTROLLER_HANDHELD; g_controllerP1StickAutoID = CONTROLLER_HANDHELD;
g_controllerAnyID = CONTROLLER_HANDHELD;
g_controllerStickAnyID = CONTROLLER_HANDHELD;
rwlockWriteUnlock(&g_hidLock); rwlockWriteUnlock(&g_hidLock);
} }
@ -225,35 +229,55 @@ void hidScanInput(void) {
g_controllerUp[i] = g_controllerOld[i] & (~g_controllerHeld[i]); g_controllerUp[i] = g_controllerOld[i] & (~g_controllerHeld[i]);
} }
// For P1_AUTO, newer inputs > older inputs // For P1_AUTO and ANY, newer inputs > older inputs
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
if (g_controllerHeldStartTime[i] > g_controllerHeldStartTime[g_controllerP1AutoID]) if (g_controllerHeldStartTime[i] > g_controllerHeldStartTime[g_controllerAnyID])
g_controllerP1AutoID = i; g_controllerAnyID = i;
} }
if (g_controllerHeldStartTime[CONTROLLER_HANDHELD] > g_controllerHeldStartTime[CONTROLLER_PLAYER_1])
g_controllerP1AutoID = CONTROLLER_HANDHELD;
else
g_controllerP1AutoID = CONTROLLER_PLAYER_1;
// and older joystick values > newer joystick values // and older joystick values > newer joystick values
bool noCommandingJoystick = true; bool noCommandingJoystick = true;
bool noCommandingJoystickAuto = true;
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
if (!g_controllerStickHeldStartTime[i]) continue; if (!g_controllerStickHeldStartTime[i]) continue;
noCommandingJoystick = false; noCommandingJoystick = false;
if (g_controllerStickHeldStartTime[i] < g_controllerStickHeldStartTime[g_controllerP1StickAutoID] if (g_controllerStickHeldStartTime[i] < g_controllerStickHeldStartTime[g_controllerStickAnyID]
|| !g_controllerStickHeldStartTime[g_controllerStickAnyID])
g_controllerStickAnyID = i;
}
int p1AutoIDs[2] = {CONTROLLER_HANDHELD, CONTROLLER_PLAYER_1};
for (int i = 0; i < 2; i++)
{
int id = p1AutoIDs[i];
if (!g_controllerStickHeldStartTime[id]) continue;
noCommandingJoystickAuto = false;
if (g_controllerStickHeldStartTime[id] < g_controllerStickHeldStartTime[g_controllerP1StickAutoID]
|| !g_controllerStickHeldStartTime[g_controllerP1StickAutoID]) || !g_controllerStickHeldStartTime[g_controllerP1StickAutoID])
g_controllerP1StickAutoID = i; g_controllerP1StickAutoID = id;
} }
// Fall back to the commanding controller if no joysticks are held // Fall back to the commanding controller if no joysticks are held
// Note: The commanding stick controller is what actually gets shown // Note: The commanding stick controller is what actually gets shown
// in the home menu, album, etc in the lower left corner. // in the home menu, album, etc in the lower left corner.
if (noCommandingJoystick) g_controllerP1StickAutoID = g_controllerP1AutoID; if (noCommandingJoystick) g_controllerStickAnyID = g_controllerAnyID;
if (noCommandingJoystickAuto) g_controllerP1StickAutoID = g_controllerP1AutoID;
rwlockWriteUnlock(&g_hidLock); rwlockWriteUnlock(&g_hidLock);
} }
u64 hidKeysHeld(HidControllerID id) { u64 hidKeysHeld(HidControllerID id) {
if (id==CONTROLLER_P1_AUTO) return hidKeysHeld(g_controllerP1AutoID); if (id==CONTROLLER_P1_AUTO) return hidKeysHeld(g_controllerP1AutoID);
if (id==CONTROLLER_ANY) return hidKeysHeld(g_controllerAnyID);
if (id < 0 || id > 9) return 0; if (id < 0 || id > 9) return 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
@ -265,6 +289,7 @@ u64 hidKeysHeld(HidControllerID id) {
u64 hidKeysDown(HidControllerID id) { u64 hidKeysDown(HidControllerID id) {
if (id==CONTROLLER_P1_AUTO) return hidKeysDown(g_controllerP1AutoID); if (id==CONTROLLER_P1_AUTO) return hidKeysDown(g_controllerP1AutoID);
if (id==CONTROLLER_ANY) return hidKeysDown(g_controllerAnyID);
if (id < 0 || id > 9) return 0; if (id < 0 || id > 9) return 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
@ -276,6 +301,7 @@ u64 hidKeysDown(HidControllerID id) {
u64 hidKeysUp(HidControllerID id) { u64 hidKeysUp(HidControllerID id) {
if (id==CONTROLLER_P1_AUTO) return hidKeysUp(g_controllerP1AutoID); if (id==CONTROLLER_P1_AUTO) return hidKeysUp(g_controllerP1AutoID);
if (id==CONTROLLER_ANY) return hidKeysUp(g_controllerAnyID);
if (id < 0 || id > 9) return 0; if (id < 0 || id > 9) return 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
@ -384,6 +410,7 @@ void hidTouchRead(touchPosition *pos, u32 point_id) {
void hidJoystickRead(JoystickPosition *pos, HidControllerID id, HidControllerJoystick stick) { void hidJoystickRead(JoystickPosition *pos, HidControllerID id, HidControllerJoystick stick) {
if (id == CONTROLLER_P1_AUTO) return hidJoystickRead(pos, g_controllerP1StickAutoID, stick); if (id == CONTROLLER_P1_AUTO) return hidJoystickRead(pos, g_controllerP1StickAutoID, stick);
if (id == CONTROLLER_ANY) return hidJoystickRead(pos, g_controllerStickAnyID, stick);
if (pos) { if (pos) {
if (id < 0 || id > 9 || stick >= JOYSTICK_NUM_STICKS) { if (id < 0 || id > 9 || stick >= JOYSTICK_NUM_STICKS) {