Skip to content

improve support for gamepads #7655

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

Merged
notimaginative merged 2 commits into from
Aug 4, 2026
Merged

improve support for gamepads #7655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb42dde
add proper gamepad support
notimaginative Jul 12, 2025
61b272a
address feedback
notimaginative Aug 3, 2026
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
51 changes: 43 additions & 8 deletions code/controlconfig/controlsconfigcommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2611,25 +2611,51 @@ void CC_bind::invert_toggle() {
flags ^= CCF_INVERTED;
}


static bool compare_btn(short cid, const CC_bind& A, char& A_flags, const CC_bind& B, char& B_flags)
{
auto A_btn = A.get_btn();
auto B_btn = B.get_btn();

auto current = io::joystick::getPlayerJoystick(cid);

if (current && current->isGamepad()) {
if (A_btn >= SDL_GAMEPAD_BUTTON_COUNT) {
A_btn = (A_btn - SDL_GAMEPAD_BUTTON_COUNT) + SDL_GAMEPAD_AXIS_LEFT_TRIGGER;
A_flags |= CCF_AXIS_BTN;
}

if (B_btn >= SDL_GAMEPAD_BUTTON_COUNT) {
B_btn = (B_btn - SDL_GAMEPAD_BUTTON_COUNT) + SDL_GAMEPAD_AXIS_LEFT_TRIGGER;
B_flags |= CCF_AXIS_BTN;
}
}

return (A_btn == B_btn);
}

bool CC_bind::conflicts_with(const CC_bind& B) const {
char A_flags = flags;
char B_flags = B.flags;

// Bail early if CID or btn are not the same
if ((cid != B.cid) || (btn != B.btn)) {
if ((cid != B.cid) || !compare_btn(cid, *this, A_flags, B, B_flags)) {
return false;
}

// Check if A is an Axis or Axis Button, and if B is an Axis or Axis Button
char mask = (CCF_AXIS_BTN | CCF_AXIS);
if ((flags & mask) && (B.flags & mask)) {
if ((A_flags & mask) && (B_flags & mask)) {
return true;
}

// Check if Hat
if (flags & B.flags & CCF_HAT) {
if (A_flags & B_flags & CCF_HAT) {
return true;
}

// Check if Ball
if (flags & B.flags & CCF_BALL) {
if (A_flags & B_flags & CCF_BALL) {
return true;
}

Expand All @@ -2641,7 +2667,7 @@ bool CC_bind::conflicts_with(const CC_bind& B) const {
// First off, check if A or B is NOT a button, as according to the mask. Buttons do not have a flag, so we check
// if they are any of the other input types
// Next, we return the inverse of the result. Negative of a Negative = Positive. Not Not a button = Is a button
return !((flags | B.flags) & mask);
return !((A_flags | B_flags) & mask);
}

bool CC_bind::is_inverted() const {
Expand Down Expand Up @@ -2732,10 +2758,19 @@ SCP_string CC_bind::textify() const {
case CID_JOY0:
case CID_JOY1:
case CID_JOY2:
case CID_JOY3:
Assert((btn >= 0) && (btn < JOY_TOTAL_BUTTONS));
retval = SCP_string(textify_button(btn));
case CID_JOY3: {
auto axis = joy_get_button_axis(cid, btn);

if (axis < 0) {
Assert((btn >= 0) && (btn < JOY_TOTAL_BUTTONS));
retval = SCP_string(textify_button(btn));
} else {
Assert((axis >= 0) && (axis < NUM_AXIS_TEXT));
retval = SCP_string(Axis_text[axis]);
}

break;
}

case CID_NONE:
default:
Expand Down
Loading
Loading