Skip to content

Allow Mouse mapping #1121

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

Closed
Yiori wants to merge 1 commit into from
Closed

Allow Mouse mapping #1121

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
19 changes: 19 additions & 0 deletions src/dusk/ui/controller_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,14 @@ Rml::String keyboard_key_name(s32 scancode) {
return "Mouse X1";
case PAD_KEY_MOUSE_X2:
return "Mouse X2";
case PAD_KEY_MOUSE_AXIS_X_POS:
return "Mouse X+";
case PAD_KEY_MOUSE_AXIS_X_NEG:
return "Mouse X-";
case PAD_KEY_MOUSE_AXIS_Y_POS:
return "Mouse Y+";
case PAD_KEY_MOUSE_AXIS_Y_NEG:
return "Mouse Y-";
default:
break;
}
Expand Down Expand Up @@ -284,6 +292,14 @@ s32 keyboard_key_pressed() {
return -(btn + 1); // maps to PAD_KEY_MOUSE_LEFT (-2), etc.
}
}
float relX, relY;
SDL_GetRelativeMouseState(&relX, &relY);
if (std::abs(relX) > 5.0f) {
return relX > 0 ? PAD_KEY_MOUSE_AXIS_X_POS : PAD_KEY_MOUSE_AXIS_X_NEG;
}
if (std::abs(relY) > 5.0f) {
return relY > 0 ? PAD_KEY_MOUSE_AXIS_Y_POS : PAD_KEY_MOUSE_AXIS_Y_NEG;
}
return PAD_KEY_INVALID;
}

Expand Down Expand Up @@ -974,6 +990,9 @@ void ControllerConfigWindow::poll_pending_binding() {
if (!mPendingBindingArmed) {
if (pending_input_neutral()) {
mPendingBindingArmed = true;
// Flush any mouse movement that occurred during the click/arming process
float dummyX, dummyY;
SDL_GetRelativeMouseState(&dummyX, &dummyY);
}
return;
}
Expand Down