镜像站点 · 本页由第三方 GitHub 只读镜像提供，非 GitHub 官方站点，不接受任何登录或凭据输入。前往 github.com
Skip to content

Track which stick axis starts repeating and stop when that axis retur… #48

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
SrBananaMan wants to merge 1 commit into
base: multiplayer
Choose a base branch
from
Open

Track which stick axis starts repeating and stop when that axis retur… #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions recompui/src/base/ui_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,8 @@ void draw_hook(plume::RenderCommandList* command_list, plume::RenderFramebuffer*
constexpr clock::duration repeat_rate = std::chrono::milliseconds{50};
static clock::time_point next_repeat_time = {};
static int latest_controller_key_pressed = SDLK_UNKNOWN;
// Remember which stick axis started the repeat, independently of its direction.
static int latest_controller_axis_pressed = SDL_CONTROLLER_AXIS_INVALID;

bool all_input_is_disabled = recompinput::all_input_disabled();

Expand All @@ -689,7 +691,7 @@ void draw_hook(plume::RenderCommandList* command_list, plume::RenderFramebuffer*
// Handle up button events even when input is disabled to avoid missing them during binding.
if (cur_event.type == SDL_EventType::SDL_CONTROLLERBUTTONUP) {
int sdl_key = cont_button_to_key(cur_event.cbutton);
if (sdl_key == latest_controller_key_pressed) {
if (latest_controller_axis_pressed == SDL_CONTROLLER_AXIS_INVALID && sdl_key == latest_controller_key_pressed) {
latest_controller_key_pressed = SDLK_UNKNOWN;
}
}
Expand Down Expand Up @@ -733,6 +735,7 @@ void draw_hook(plume::RenderCommandList* command_list, plume::RenderFramebuffer*
if (context_capturing_input && sdl_key) {
ui_state->context->ProcessKeyDown(convert_sdl_to_rml(sdl_key), 0);
latest_controller_key_pressed = sdl_key;
latest_controller_axis_pressed = SDL_CONTROLLER_AXIS_INVALID;
next_repeat_time = clock::now() + start_repeat_delay;
}
non_mouse_interacted = true;
Expand Down Expand Up @@ -778,6 +781,7 @@ void draw_hook(plume::RenderCommandList* command_list, plume::RenderFramebuffer*
if (context_capturing_input && sdl_key) {
ui_state->context->ProcessKeyDown(convert_sdl_to_rml(sdl_key), 0);
latest_controller_key_pressed = sdl_key;
latest_controller_axis_pressed = axis_event->axis;
next_repeat_time = clock::now() + start_repeat_delay;
}
}
Expand All @@ -786,10 +790,10 @@ void draw_hook(plume::RenderCommandList* command_list, plume::RenderFramebuffer*
}
else if (*await_stick_return && fabsf(axis_value) < 0.15f) {
*await_stick_return = false;
// Stop pressing the current key if the axis that was released was the one triggering key presses.
int sdl_key = cont_axis_to_key(cur_event.caxis, axis_value);
if (sdl_key == latest_controller_key_pressed) {
// Stop repeating when the active stick axis returns to center.
if (axis_event->axis == latest_controller_axis_pressed) {
latest_controller_key_pressed = SDLK_UNKNOWN;
latest_controller_axis_pressed = SDL_CONTROLLER_AXIS_INVALID;
}
}
break;
Expand Down