mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

hid: Added hidGetMouseStates, which hidScanInput/etc now uses.

Browse Source 
Struct adjustments.
This commit is contained in:
yellows8 2020-11-19 17:35:00 -05:00 committed by fincs
parent dc0bc2ab7b
commit 52bf73e047
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,20 +505,26 @@ typedef struct HidTouchScreenLifo {
// Begin HidMouse
/// HidMouseEntry
typedef struct HidMouseEntry {
/// HidMouseState
typedef struct HidMouseState {
u64 timestamp;
u64 timestamp_2;
MousePosition position;
u64 buttons;
} HidMouseEntry;
u32 buttons;
u32 attributes;
} HidMouseState;
/// HidMouse
typedef struct HidMouse {
/// HidMouseStateAtomicStorage
typedef struct HidMouseStateAtomicStorage {
u64 timestamp;
HidMouseState state;
} HidMouseStateAtomicStorage;
/// HidMouseLifo
typedef struct HidMouseLifo {
HidCommonStateHeader header;
HidMouseEntry entries[17];
HidMouseStateAtomicStorage entries[17];
u8 padding[0xB0];
} HidMouse;
} HidMouseLifo;
// End HidMouse
@ -762,7 +768,7 @@ typedef struct {
typedef struct HidSharedMemory {
u8 debug_pad[0x400];
HidTouchScreenLifo touchscreen;
HidMouse mouse;
HidMouseLifo mouse;
HidKeyboard keyboard;
u8 digitizer[0x1000]; ///< [10.0.0+] Digitizer [1.0.0-9.2.0] BasicXpad
u8 home_button[0x200];
@ -871,6 +877,8 @@ void hidScanInput(void);
size_t hidGetTouchScreenStates(HidTouchScreenState *states, size_t count);
size_t hidGetMouseStates(HidMouseState *states, size_t count);
/// Gets a bitfield of \ref HidNpadStyleTag for the specified controller.
u32 hidGetNpadStyleSet(HidNpadIdType id);

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

@ -17,8 +17,7 @@ static Service g_hidIActiveVibrationDeviceList;
static SharedMemory g_hidSharedmem;
static HidTouchScreenState g_touchScreenState;
static HidMouseEntry *g_mouseEntry;
static HidMouse g_mouse;
static HidMouseState g_mouseState;
static HidKeyboardEntry g_keyboardEntry;
static HidNpadStateEntry g_controllerEntries[10];
@ -27,7 +26,7 @@ static u64 g_keyboardModOld, g_keyboardModHeld, g_keyboardModDown, g_keyboardMod
static u32 g_keyboardOld[8], g_keyboardHeld[8], g_keyboardDown[8], g_keyboardUp[8];
static u64 g_controllerOld[10], g_controllerHeld[10], g_controllerDown[10], g_controllerUp[10];
static u64 g_mouseTimestamp, g_keyboardTimestamp;
static u64 g_keyboardTimestamp;
static HidControllerID g_controllerP1AutoID;
@ -120,11 +119,10 @@ void hidReset(void) {
// Reset internal state
memset(&g_touchScreenState, 0, sizeof(HidTouchScreenState));
memset(&g_mouse, 0, sizeof(HidMouse));
memset(&g_mouseState, 0, sizeof(HidMouseState));
memset(&g_keyboardEntry, 0, sizeof(HidKeyboardEntry));
memset(g_controllerEntries, 0, sizeof(g_controllerEntries));
g_mouseEntry = &g_mouse.entries[0];
g_mouseOld = g_mouseHeld = g_mouseDown = g_mouseUp = 0;
g_keyboardModOld = g_keyboardModHeld = g_keyboardModDown = g_keyboardModUp = 0;
for (int i = 0; i < 8; i++)
@ -132,8 +130,6 @@ void hidReset(void) {
for (int i = 0; i < 10; i++)
g_controllerOld[i] = g_controllerHeld[i] = g_controllerDown[i] = g_controllerUp[i] = 0;
g_mouseTimestamp = g_keyboardTimestamp = 0;
g_controllerP1AutoID = CONTROLLER_HANDHELD;
rwlockWriteUnlock(&g_hidLock);
@ -162,7 +158,7 @@ void hidScanInput(void) {
memset(g_keyboardHeld, 0, sizeof(g_keyboardHeld));
memset(g_controllerHeld, 0, sizeof(g_controllerHeld));
memset(&g_touchScreenState, 0, sizeof(HidTouchScreenState));
memset(&g_mouse, 0, sizeof(HidMouse));
memset(&g_mouseState, 0, sizeof(HidMouseState));
memset(&g_keyboardEntry, 0, sizeof(HidKeyboardEntry));
memset(g_controllerEntries, 0, sizeof(g_controllerEntries));
@ -171,17 +167,11 @@ void hidScanInput(void) {
g_controllerHeld[CONTROLLER_HANDHELD] |= KEY_TOUCH;
}
u64 latestMouseEntry = sharedMem->mouse.header.latest_entry;
HidMouseEntry *newMouseEntry = &sharedMem->mouse.entries[latestMouseEntry];
memcpy(&g_mouse, &sharedMem->mouse, sizeof(HidMouse));
if ((s64)(newMouseEntry->timestamp - g_mouseTimestamp) >= 0) {
g_mouseEntry = &g_mouse.entries[latestMouseEntry];
g_mouseTimestamp = newMouseEntry->timestamp;
g_mouseHeld = g_mouseEntry->buttons;
if (hidGetMouseStates(&g_mouseState, 1)) {
g_mouseHeld = g_mouseState.buttons;
g_mouseDown = (~g_mouseOld) & g_mouseHeld;
g_mouseUp = g_mouseOld & (~g_mouseHeld);
}
g_mouseDown = (~g_mouseOld) & g_mouseHeld;
g_mouseUp = g_mouseOld & (~g_mouseHeld);
u64 latestKeyboardEntry = sharedMem->keyboard.header.latest_entry;
HidKeyboardEntry *newKeyboardEntry = &sharedMem->keyboard.entries[latestKeyboardEntry];
@ -426,6 +416,15 @@ size_t hidGetTouchScreenStates(HidTouchScreenState *states, size_t count) {
return total;
}
size_t hidGetMouseStates(HidMouseState *states, size_t count) {
HidSharedMemory *sharedmem = (HidSharedMemory*)hidGetSharedmemAddr();
if (sharedmem == NULL)
diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_NotInitialized));
size_t total = _hidGetStates(&sharedmem->mouse.header, sharedmem->mouse.entries, offsetof(HidMouseState,timestamp), states, sizeof(HidMouseState), count);
return total;
}
static size_t _hidGetNpadStates(HidNpad *npad, u32 layout, HidNpadStateEntry *states, size_t count) {
HidControllerLayout *states_buf = &npad->layouts[layout];
if (count > 17) count = 17;
@ -742,42 +741,25 @@ u64 hidMouseButtonsUp(void) {
void hidMouseRead(MousePosition *pos) {
rwlockReadLock(&g_hidLock);
*pos = g_mouseEntry->position;
*pos = g_mouseState.position;
rwlockReadUnlock(&g_hidLock);
}
u32 hidMouseMultiRead(MousePosition *entries, u32 num_entries) {
int entry;
int i;
HidMouseState temp_states[17];
if (!entries || !num_entries) return 0;
if (num_entries > 17) num_entries = 17;
memset(entries, 0, sizeof(MousePosition) * num_entries);
rwlockReadLock(&g_hidLock);
size_t total = hidGetMouseStates(temp_states, num_entries);
if (num_entries > g_mouse.header.max_entry + 1)
num_entries = g_mouse.header.max_entry + 1;
entry = g_mouse.header.latest_entry + 1 - num_entries;
if (entry < 0)
entry += g_mouse.header.max_entry + 1;
u64 timestamp = 0;
for (i = 0; i < num_entries; i++) {
if (timestamp && g_mouse.entries[entry].timestamp - timestamp != 1)
break;
memcpy(&entries[i], &g_mouse.entries[entry].position, sizeof(MousePosition));
timestamp = g_mouse.entries[entry].timestamp;
entry++;
if (entry > g_mouse.header.max_entry)
entry = 0;
for (size_t i=0; i<total; i++) {
entries[i] = temp_states[i].position;
}
rwlockReadUnlock(&g_hidLock);
return i;
return total;
}
bool hidKeyboardModifierHeld(HidKeyboardModifier modifier) {