archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-28 17:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes, mouse AUX buttons, joystick detect menu

Browse Source
This commit is contained in:
eray orçunus
2020-09-30 20:02:47 +03:00
parent 8235fe08d1
commit 595421da39
14 changed files with 456 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/skel/crossplatform.h
View File

@ -67,6 +67,10 @@ void CapturePad(RwInt32 padID);
void joysChangeCB(int jid, int event);
#endif
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
extern char gSelectedJoystickName[128];
#endif
enum eGameState
{
GS_START_UP = 0,

50
src/skel/glfw/glfw.cpp
View File

@ -87,6 +87,11 @@ long _dwOperatingSystemVersion;
#include <signal.h>
#include <errno.h>
#endif
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
char gSelectedJoystickName[128] = "";
#endif
/*
*****************************************************************************
*/
@ -822,31 +827,19 @@ void joysChangeCB(int jid, int event);
bool IsThisJoystickBlacklisted(int i)
{
#ifndef DONT_TRUST_RECOGNIZED_JOYSTICKS
return false;
#else
if (glfwJoystickIsGamepad(i))
return false;
const char* joyname = glfwGetJoystickName(i);
// this is just a keyboard and mouse
// Microsoft Microsoft® 2.4GHz Transceiver v8.0 Consumer Control
// Microsoft Microsoft® 2.4GHz Transceiver v8.0 System Control
if (strstr(joyname, "2.4GHz Transceiver"))
return true;
// COMPANY USB Device System Control
// COMPANY USB Device Consumer Control
if (strstr(joyname, "COMPANY USB"))
return true;
// i.e. Synaptics TM2438-005
if (strstr(joyname, "Synaptics "))
return true;
// i.e. ELAN Touchscreen
if (strstr(joyname, "ELAN "))
return true;
// i.e. Primax Electronics, Ltd HP Wireless Keyboard Mouse Kit Consumer Control
if (strstr(joyname, "Keyboard"))
return true;
if (strncmp(joyname, gSelectedJoystickName, sizeof(gSelectedJoystickName)) == 0)
return false;
return false;
return true;
#endif
}
void _InputInitialiseJoys()
@ -865,6 +858,7 @@ void _InputInitialiseJoys()
if (PSGLOBAL(joy1id) != -1) {
int count;
glfwGetJoystickButtons(PSGLOBAL(joy1id), &count);
strcpy(gSelectedJoystickName, glfwGetJoystickName(PSGLOBAL(joy1id)));
ControlsManager.InitDefaultControlConfigJoyPad(count);
}
}
@ -2070,18 +2064,18 @@ void CapturePad(RwInt32 padID)
void joysChangeCB(int jid, int event)
{
if (event == GLFW_CONNECTED && !IsThisJoystickBlacklisted(jid))
{
if (PSGLOBAL(joy1id) == -1)
if (event == GLFW_CONNECTED && !IsThisJoystickBlacklisted(jid)) {
if (PSGLOBAL(joy1id) == -1) {
PSGLOBAL(joy1id) = jid;
else if (PSGLOBAL(joy2id) == -1)
strcpy(gSelectedJoystickName, glfwGetJoystickName(jid));
} else if (PSGLOBAL(joy2id) == -1)
PSGLOBAL(joy2id) = jid;
}
else if (event == GLFW_DISCONNECTED)
{
if (PSGLOBAL(joy1id) == jid)
} else if (event == GLFW_DISCONNECTED) {
if (PSGLOBAL(joy1id) == jid) {
PSGLOBAL(joy1id) = -1;
else if (PSGLOBAL(joy2id) == jid)
strcpy(gSelectedJoystickName, "");
} else if (PSGLOBAL(joy2id) == jid)
PSGLOBAL(joy2id) = -1;
}
}