Skip to content

Scale pointer coordinates even when logical presentation is disabled #607

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
Kontrabant merged 1 commit into from
Jun 18, 2026
Merged

Scale pointer coordinates even when logical presentation is disabled #607

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
46 changes: 17 additions & 29 deletions src/sdl2_compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2304,22 +2304,18 @@ static SDL2_Event *Event3to2(const SDL_Event *event3, SDL2_Event *event2)
case SDL_EVENT_MOUSE_MOTION:
renderer = SDL3_GetRenderer(SDL3_GetWindowFromID(event3->motion.windowID));
if (renderer) {
SDL_RendererLogicalPresentation mode = SDL_LOGICAL_PRESENTATION_DISABLED;
SDL3_GetRenderLogicalPresentation(renderer, NULL, NULL, &mode);
if (mode != SDL_LOGICAL_PRESENTATION_DISABLED) {
SDL3_memcpy(&cvtevent3, event3, sizeof (SDL_Event));
SDL3_ConvertEventToRenderCoordinates(renderer, &cvtevent3);
if (SDL3_GetBooleanProperty(SDL3_GetRendererProperties(renderer), PROP_RENDERER_RELATIVE_SCALING, true)) {
/* Accumulate scaled relative motion */
residual_motion_x = SDL3_modff(residual_motion_x + cvtevent3.motion.xrel, &cvtevent3.motion.xrel);
residual_motion_y = SDL3_modff(residual_motion_y + cvtevent3.motion.yrel, &cvtevent3.motion.yrel);
} else {
/* Undo the relative scaling that SDL_ConvertEventToRenderCoordinates() performed */
cvtevent3.motion.xrel = event3->motion.xrel;
cvtevent3.motion.yrel = event3->motion.yrel;
}
event3 = &cvtevent3;
SDL3_memcpy(&cvtevent3, event3, sizeof (SDL_Event));
SDL3_ConvertEventToRenderCoordinates(renderer, &cvtevent3);
if (SDL3_GetBooleanProperty(SDL3_GetRendererProperties(renderer), PROP_RENDERER_RELATIVE_SCALING, true)) {
/* Accumulate scaled relative motion */
residual_motion_x = SDL3_modff(residual_motion_x + cvtevent3.motion.xrel, &cvtevent3.motion.xrel);
residual_motion_y = SDL3_modff(residual_motion_y + cvtevent3.motion.yrel, &cvtevent3.motion.yrel);
} else {
/* Undo the relative scaling that SDL_ConvertEventToRenderCoordinates() performed */
cvtevent3.motion.xrel = event3->motion.xrel;
cvtevent3.motion.yrel = event3->motion.yrel;
}
event3 = &cvtevent3;
}
if (UseSDL2PrereleaseEvents) {
SDL2PRERELEASE_MouseMotionEvent *motion = (SDL2PRERELEASE_MouseMotionEvent *)&event2->motion;
Expand All @@ -2340,13 +2336,9 @@ static SDL2_Event *Event3to2(const SDL_Event *event3, SDL2_Event *event2)
case SDL_EVENT_MOUSE_BUTTON_UP:
renderer = SDL3_GetRenderer(SDL3_GetWindowFromID(event3->button.windowID));
if (renderer) {
SDL_RendererLogicalPresentation mode = SDL_LOGICAL_PRESENTATION_DISABLED;
SDL3_GetRenderLogicalPresentation(renderer, NULL, NULL, &mode);
if (mode != SDL_LOGICAL_PRESENTATION_DISABLED) {
SDL3_memcpy(&cvtevent3, event3, sizeof (SDL_Event));
SDL3_ConvertEventToRenderCoordinates(renderer, &cvtevent3);
event3 = &cvtevent3;
}
SDL3_memcpy(&cvtevent3, event3, sizeof(SDL_Event));
SDL3_ConvertEventToRenderCoordinates(renderer, &cvtevent3);
event3 = &cvtevent3;
}
if (UseSDL2PrereleaseEvents) {
SDL2PRERELEASE_MouseButtonEvent *button = (SDL2PRERELEASE_MouseButtonEvent *)&event2->button;
Expand All @@ -2363,13 +2355,9 @@ static SDL2_Event *Event3to2(const SDL_Event *event3, SDL2_Event *event2)
case SDL_EVENT_MOUSE_WHEEL:
renderer = SDL3_GetRenderer(SDL3_GetWindowFromID(event3->wheel.windowID));
if (renderer) {
SDL_RendererLogicalPresentation mode = SDL_LOGICAL_PRESENTATION_DISABLED;
SDL3_GetRenderLogicalPresentation(renderer, NULL, NULL, &mode);
if (mode != SDL_LOGICAL_PRESENTATION_DISABLED) {
SDL3_memcpy(&cvtevent3, event3, sizeof (SDL_Event));
SDL3_ConvertEventToRenderCoordinates(renderer, &cvtevent3);
event3 = &cvtevent3;
}
SDL3_memcpy(&cvtevent3, event3, sizeof(SDL_Event));
SDL3_ConvertEventToRenderCoordinates(renderer, &cvtevent3);
event3 = &cvtevent3;
}
if (UseSDL2PrereleaseEvents) {
SDL2PRERELEASE_MouseWheelEvent *wheel = (SDL2PRERELEASE_MouseWheelEvent *)&event2->wheel;
Expand Down
Loading