MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up after merge

Browse Source
This commit is contained in:
Michael 2023-10-14 14:08:32 -04:00
parent da28b352b8
commit 4d07da8973
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rcore.c
View File

@ -2168,7 +2168,7 @@ int GetGamepadButtonPressed(void)
// Get gamepad axis count // Get gamepad axis count
int GetGamepadAxisCount(int gamepad) int GetGamepadAxisCount(int gamepad)
{ {
return CORE.Input.Gamepad.axisCount; return CORE.Input.Gamepad.axisCount[gamepad];
} }
// Get axis movement vector for a gamepad // Get axis movement vector for a gamepad

7
src/rcore_drm.c
View File

@ -174,7 +174,7 @@ static void PollKeyboardEvents(void); // Process evdev keyboar
static void *EventThread(void *arg); // Input device events reading thread static void *EventThread(void *arg); // Input device events reading thread
//static void InitGamepad(void); // Initialize raw gamepad input //static void InitGamepad(void); // Initialize raw gamepad input
static void *GamepadThread(void *arg); // Mouse reading thread //static void *GamepadThread(void *arg); // Mouse reading thread
static int FindMatchingConnectorMode(const drmModeConnector *connector, const drmModeModeInfo *mode); // Search matching DRM mode in connector's mode list static int FindMatchingConnectorMode(const drmModeConnector *connector, const drmModeModeInfo *mode); // Search matching DRM mode in connector's mode list
static int FindExactConnectorMode(const drmModeConnector *connector, uint width, uint height, uint fps, bool allowInterlaced); // Search exactly matching DRM connector mode in connector's list static int FindExactConnectorMode(const drmModeConnector *connector, uint width, uint height, uint fps, bool allowInterlaced); // Search exactly matching DRM connector mode in connector's list
@ -1074,7 +1074,8 @@ static int InitPlatform(void)
// Initialize raw input system // Initialize raw input system
InitEvdevInput(); // Evdev inputs initialization InitEvdevInput(); // Evdev inputs initialization
InitGamepad(); // Gamepad init InitDrmInput();
//InitGamepad(); // Gamepad init
InitKeyboard(); // Keyboard init (stdin) InitKeyboard(); // Keyboard init (stdin)
return 0; return 0;
@ -1417,7 +1418,7 @@ static void InitDrmJoystick(int index, const char *path)
{ {
TraceLog(LOG_INFO, TextFormat("InitDrmJoystick - %s", path)); TraceLog(LOG_INFO, TextFormat("InitDrmJoystick - %s", path));
int result = (platform.gamepadStreamFd[index] = open(path, O_RDONLY | O_NONBLOCK)); platform.gamepadStreamFd[index] = open(path, O_RDONLY | O_NONBLOCK);
// Get the name of the device. // Get the name of the device.
ioctl(platform.gamepadStreamFd[index], EVIOCGNAME(64), &CORE.Input.Gamepad.name[index]); ioctl(platform.gamepadStreamFd[index], EVIOCGNAME(64), &CORE.Input.Gamepad.name[index]);