Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed a bug where when only pressing the LEFT or RIGHT DPAD_KEY the GamepadButtonDown method reported an ghosting DPAD_UP keyevent as well #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed a bug where when only pressing the LEFT or RIGHT DPAD_KEY the GamepadButtonDown method reported an ghosting DPAD_UP keyevent as well #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ac247c
Update gamepad.h
jikelmon Mar 16, 2017
4e1cff0
Update gamepad.c
jikelmon Mar 16, 2017
7c9dd3e
Update gamepad.c
jikelmon Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gamepad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ static void GamepadAddDevice(const char* devPath) {
}

/* reset device state */
GamepadResetState(i);
GamepadResetState((GAMEPAD_DEVICE)i);

/* attempt to open the device in read-write mode, which we need fo rumble */
STATE[i].fd = open(STATE[i].device, O_RDWR|O_NONBLOCK);
Expand Down Expand Up @@ -449,7 +449,7 @@ GAMEPAD_BOOL GamepadIsConnected(GAMEPAD_DEVICE device) {
}

GAMEPAD_BOOL GamepadButtonDown(GAMEPAD_DEVICE device, GAMEPAD_BUTTON button) {
return (STATE[device].bCurrent & BUTTON_TO_FLAG(button)) != 0 ? GAMEPAD_TRUE : GAMEPAD_FALSE;
return ((STATE[device].bCurrent & BUTTON_TO_FLAG(button)) == BUTTON_TO_FLAG(button)) ? GAMEPAD_TRUE : GAMEPAD_FALSE;
}

GAMEPAD_BOOL GamepadButtonTriggered(GAMEPAD_DEVICE device, GAMEPAD_BUTTON button) {
Expand Down
28 changes: 14 additions & 14 deletions gamepad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ enum GAMEPAD_DEVICE {
* Enumeration of the possible buttons.
*/
enum GAMEPAD_BUTTON {
BUTTON_DPAD_UP = 0, /**< UP on the direction pad */
BUTTON_DPAD_DOWN = 1, /**< DOWN on the direction pad */
BUTTON_DPAD_LEFT = 2, /**< LEFT on the direction pad */
BUTTON_DPAD_RIGHT = 3, /**< RIGHT on the direction pad */
BUTTON_START = 4, /**< START button */
BUTTON_BACK = 5, /**< BACK button */
BUTTON_LEFT_THUMB = 6, /**< Left analog stick button */
BUTTON_RIGHT_THUMB = 7, /**< Right analog stick button */
BUTTON_LEFT_SHOULDER = 8, /**< Left bumper button */
BUTTON_RIGHT_SHOULDER = 9, /**< Right bumper button */
BUTTON_A = 12, /**< A button */
BUTTON_B = 13, /**< B button */
BUTTON_X = 14, /**< X button */
BUTTON_Y = 15, /**< Y button */
BUTTON_DPAD_UP = 1, /**< UP on the direction pad */
BUTTON_DPAD_DOWN = 2, /**< DOWN on the direction pad */
BUTTON_DPAD_LEFT = 3, /**< LEFT on the direction pad */
BUTTON_DPAD_RIGHT = 4, /**< RIGHT on the direction pad */
BUTTON_START = 5, /**< START button */
BUTTON_BACK = 6, /**< BACK button */
BUTTON_LEFT_THUMB = 7, /**< Left analog stick button */
BUTTON_RIGHT_THUMB = 8, /**< Right analog stick button */
BUTTON_LEFT_SHOULDER = 9, /**< Left bumper button */
BUTTON_RIGHT_SHOULDER = 10, /**< Right bumper button */
BUTTON_A = 13, /**< A button */
BUTTON_B = 14, /**< B button */
BUTTON_X = 15, /**< X button */
BUTTON_Y = 16, /**< Y button */

BUTTON_COUNT /**< Maximum number of supported buttons */
};
Expand Down