mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

mouse: Add internal integer mouse mode hint for sdl2-compat

Browse Source 
Performing this inside SDL3 dramatically simplifies sdl2-compat. See https://github.com/libsdl-org/sdl2-compat/issues/372.

(cherry picked from commit 597bfe6b27)
This commit is contained in:
Cameron Gutman
2025-03-08 20:23:21 -06:00
committed by Sam Lantinga
parent 1173bc2dde
commit 9a6f8a2512
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/events/SDL_mouse.c
View File

@@ -234,6 +234,13 @@ static void SDLCALL SDL_MouseRelativeCursorVisibleChanged(void *userdata, const
SDL_SetCursor(NULL); // Update cursor visibility SDL_SetCursor(NULL); // Update cursor visibility
} }
static void SDLCALL SDL_MouseIntegerModeChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
{
SDL_Mouse *mouse = (SDL_Mouse *)userdata;
mouse->integer_mode = SDL_GetStringBoolean(hint, false);
}
// Public functions // Public functions
bool SDL_PreInitMouse(void) bool SDL_PreInitMouse(void)
{ {
@@ -288,6 +295,9 @@ bool SDL_PreInitMouse(void)
SDL_AddHintCallback(SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE, SDL_AddHintCallback(SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE,
SDL_MouseRelativeCursorVisibleChanged, mouse); SDL_MouseRelativeCursorVisibleChanged, mouse);
SDL_AddHintCallback("SDL_MOUSE_INTEGER_MODE",
SDL_MouseIntegerModeChanged, mouse);
mouse->was_touch_mouse_events = false; // no touch to mouse movement event pending mouse->was_touch_mouse_events = false; // no touch to mouse movement event pending
mouse->cursor_shown = true; mouse->cursor_shown = true;
@@ -720,12 +730,22 @@ static void SDL_PrivateSendMouseMotion(Uint64 timestamp, SDL_Window *window, SDL
y *= mouse->normal_speed_scale; y *= mouse->normal_speed_scale;
} }
} }
if (mouse->integer_mode) {
// Accumulate the fractional relative motion and only process the integer portion
mouse->xrel_frac = SDL_modff(mouse->xrel_frac + x, &x);
mouse->yrel_frac = SDL_modff(mouse->yrel_frac + y, &y);
}
xrel = x; xrel = x;
yrel = y; yrel = y;
x = (mouse->last_x + xrel); x = (mouse->last_x + xrel);
y = (mouse->last_y + yrel); y = (mouse->last_y + yrel);
ConstrainMousePosition(mouse, window, &x, &y); ConstrainMousePosition(mouse, window, &x, &y);
} else { } else {
if (mouse->integer_mode) {
// Discard the fractional component from absolute coordinates
x = SDL_truncf(x);
y = SDL_truncf(y);
}
ConstrainMousePosition(mouse, window, &x, &y); ConstrainMousePosition(mouse, window, &x, &y);
if (mouse->has_position) { if (mouse->has_position) {
xrel = x - mouse->last_x; xrel = x - mouse->last_x;
@@ -998,6 +1018,12 @@ void SDL_SendMouseWheel(Uint64 timestamp, SDL_Window *window, SDL_MouseID mouseI
SDL_SetMouseFocus(window); SDL_SetMouseFocus(window);
} }
// Accumulate fractional wheel motion if integer mode is enabled
if (mouse->integer_mode) {
mouse->wheel_x_frac = SDL_modff(mouse->wheel_x_frac + x, &x);
mouse->wheel_y_frac = SDL_modff(mouse->wheel_y_frac + y, &y);
}
if (x == 0.0f && y == 0.0f) { if (x == 0.0f && y == 0.0f) {
return; return;
} }
@@ -1108,6 +1134,9 @@ void SDL_QuitMouse(void)
SDL_RemoveHintCallback(SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE, SDL_RemoveHintCallback(SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE,
SDL_MouseRelativeCursorVisibleChanged, mouse); SDL_MouseRelativeCursorVisibleChanged, mouse);
SDL_RemoveHintCallback("SDL_MOUSE_INTEGER_MODE",
SDL_MouseIntegerModeChanged, mouse);
for (int i = SDL_mouse_count; i--; ) { for (int i = SDL_mouse_count; i--; ) {
SDL_RemoveMouse(SDL_mice[i].instance_id, false); SDL_RemoveMouse(SDL_mice[i].instance_id, false);
} }

5
src/events/SDL_mouse_c.h
View File

@@ -98,8 +98,13 @@ typedef struct
float x_accu; float x_accu;
float y_accu; float y_accu;
float last_x, last_y; // the last reported x and y coordinates float last_x, last_y; // the last reported x and y coordinates
float xrel_frac;
float yrel_frac;
float wheel_x_frac;
float wheel_y_frac;
double click_motion_x; double click_motion_x;
double click_motion_y; double click_motion_y;
bool integer_mode;
bool has_position; bool has_position;
bool relative_mode; bool relative_mode;
bool relative_mode_warp_motion; bool relative_mode_warp_motion;