Skip to content

[3.x] Reset joy axes and buttons after joy disconnection #106212

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

Open
orlambda wants to merge 2 commits into
base: 3.x
Choose a base branch
from
+35 −20
Open

[3.x] Reset joy axes and buttons after joy disconnection #106212

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
af8d987
Reset joy axes and buttons after joy disconnection
orlambda May 8, 2025
87537bd
Address issues
orlambda Jun 24, 2025
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: 33 additions & 18 deletions main/input_default.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,29 +285,38 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_
int uidlen = MIN(p_name.length(), 16);
for (int i = 0; i < uidlen; i++) {
uidname = uidname + _hex_str(p_name[i]);
};
};
}
}
js.uid = uidname;
js.connected = true;
int mapping = fallback_mapping;
for (int i = 0; i < map_db.size(); i++) {
if (js.uid == map_db[i].uid) {
mapping = i;
js.name = map_db[i].name;
};
};
}
}
js.mapping = mapping;
} else {
js.connected = false;
for (int i = 0; i < JOY_BUTTON_MAX; i++) {
if (i < JOY_AXIS_MAX) {
set_joy_axis(p_idx, i, 0.0f);
for (int i = JOY_BUTTON_0; i < JOY_BUTTON_MAX; i++) {
if (is_joy_button_pressed(p_idx, i)) {
_button_event(p_idx, i, false, true);
int c = _combine_device(i, p_idx);
joy_buttons_pressed.erase(c);
}

}
for (int i = JOY_AXIS_0; i < JOY_AXIS_MAX; i++) {
int c = _combine_device(i, p_idx);
joy_buttons_pressed.erase(c);
};
};
if (_joy_axis.has(c)) {
if (_joy_axis[c] != 0.0f) {
_axis_event(p_idx, i, 0.0f, true);
}
_joy_axis.erase(c);
}
}
}

joy_names[p_idx] = js;

// Ensure this signal is emitted on the main thread, as some platforms (e.g. Linux) call this from a different thread.
Expand Down Expand Up @@ -1044,25 +1053,31 @@ void InputDefault::joy_hat(int p_device, int p_val) {
joy_names[p_device].hat_current = p_val;
}

void InputDefault::_button_event(int p_device, int p_index, bool p_pressed) {
void InputDefault::_button_event(int p_device, int p_index, bool p_pressed, bool p_immediate) {
Ref<InputEventJoypadButton> ievent;
ievent.instance();
ievent->set_device(p_device);
ievent->set_button_index(p_index);
ievent->set_pressed(p_pressed);

parse_input_event(ievent);
if (p_immediate) {
_parse_input_event_impl(ievent, false);
} else {
parse_input_event(ievent);
}
}

void InputDefault::_axis_event(int p_device, int p_axis, float p_value) {
void InputDefault::_axis_event(int p_device, int p_axis, float p_value, bool p_immediate) {
Ref<InputEventJoypadMotion> ievent;
ievent.instance();
ievent->set_device(p_device);
ievent->set_axis(p_axis);
ievent->set_axis_value(p_value);

parse_input_event(ievent);
};
if (p_immediate) {
_parse_input_event_impl(ievent, false);
} else {
parse_input_event(ievent);
}
}

InputDefault::JoyEvent InputDefault::_get_mapped_button_event(const JoyDeviceMapping &mapping, int p_button) {
JoyEvent event;
Expand Down
4 changes: 2 additions & 2 deletions main/input_default.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ class InputDefault : public Input {
void _get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, JoyEvent r_events[HAT_MAX]);
JoystickList _get_output_button(String output);
JoystickList _get_output_axis(String output);
void _button_event(int p_device, int p_index, bool p_pressed);
void _axis_event(int p_device, int p_axis, float p_value);
void _button_event(int p_device, int p_index, bool p_pressed, bool p_immediate = false);
void _axis_event(int p_device, int p_axis, float p_value, bool p_immediate = false);

void _parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_emulated);

Expand Down