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

Updated SDL high DPI support

Browse Source 
We have gotten feedback that abstracting the coordinate system based on the display scale is unexpected and it is difficult to adapt existing applications to the proposed API.

The new approach is to provide the coordinate systems that people expect, but provide additional information that will help applications properly handle high DPI situations.

The concepts needed for high DPI support are documented in README-highdpi.md. An example of automatically adapting the content to display scale changes can be found in SDL_test_common.c, where auto_scale_content is checked.

Also, the SDL_WINDOW_ALLOW_HIGHDPI window flag has been replaced by the SDL_HINT_VIDEO_ENABLE_HIGH_PIXEL_DENSITY hint.

Fixes https://github.com/libsdl-org/SDL/issues/7709
This commit is contained in:
Sam Lantinga
2023-05-16 16:29:52 -07:00
parent 0fbb9c779c
commit c699f3d1d8
51 changed files with 506 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/render/SDL_render.c
View File

@@ -655,11 +655,16 @@ static void UpdateMainViewDimensions(SDL_Renderer *renderer)
{
int window_w = 0, window_h = 0;
SDL_GetRenderWindowSize(renderer, &window_w, &window_h);
if (renderer->window) {
SDL_GetWindowSize(renderer->window, &window_w, &window_h);
}
SDL_GetRenderOutputSize(renderer, &renderer->main_view.pixel_w, &renderer->main_view.pixel_h);
if (window_w > 0 && window_h > 0) {
renderer->dpi_scale.x = (float)renderer->main_view.pixel_w / window_w;
renderer->dpi_scale.y = (float)renderer->main_view.pixel_h / window_h;
} else {
renderer->dpi_scale.x = 1.0f;
renderer->dpi_scale.y = 1.0f;
}
}
@@ -1001,21 +1006,6 @@ int SDL_GetRendererInfo(SDL_Renderer *renderer, SDL_RendererInfo *info)
return 0;
}
int SDL_GetRenderWindowSize(SDL_Renderer *renderer, int *w, int *h)
{
CHECK_RENDERER_MAGIC(renderer, -1);
if (renderer->window) {
/*return */SDL_GetWindowSize(renderer->window, w, h);
return 0;
} else if (renderer->GetOutputSize) {
return renderer->GetOutputSize(renderer, w, h);
} else {
SDL_assert(0 && "This should never happen");
return SDL_SetError("Renderer doesn't support querying output size");
}
}
int SDL_GetRenderOutputSize(SDL_Renderer *renderer, int *w, int *h)
{
CHECK_RENDERER_MAGIC(renderer, -1);
@@ -1023,8 +1013,7 @@ int SDL_GetRenderOutputSize(SDL_Renderer *renderer, int *w, int *h)
if (renderer->GetOutputSize) {
return renderer->GetOutputSize(renderer, w, h);
} else if (renderer->window) {
SDL_GetWindowSizeInPixels(renderer->window, w, h);
return 0;
return SDL_GetWindowSizeInPixels(renderer->window, w, h);
} else {
SDL_assert(0 && "This should never happen");
return SDL_SetError("Renderer doesn't support querying output size");
@@ -2117,37 +2106,13 @@ static int UpdateLogicalPresentation(SDL_Renderer *renderer)
return 0;
}
if (renderer->logical_presentation_mode == SDL_LOGICAL_PRESENTATION_MATCH) {
if (SDL_GetRenderWindowSize(renderer, &logical_w, &logical_h) < 0) {
goto error;
}
if (renderer->logical_target) {
int existing_w = 0, existing_h = 0;
if (SDL_QueryTexture(renderer->logical_target, NULL, NULL, &existing_w, &existing_h) < 0) {
goto error;
}
if (logical_w != existing_w || logical_h != existing_h) {
SDL_DestroyTexture(renderer->logical_target);
}
}
if (!renderer->logical_target) {
renderer->logical_target = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_UNKNOWN, SDL_TEXTUREACCESS_TARGET, logical_w, logical_h);
if (!renderer->logical_target) {
goto error;
}
SDL_SetTextureBlendMode(renderer->logical_target, SDL_BLENDMODE_NONE);
}
} else {
if (SDL_QueryTexture(renderer->logical_target, NULL, NULL, &logical_w, &logical_h) < 0) {
goto error;
}
want_aspect = (float)logical_w / logical_h;
real_aspect = (float)output_w / output_h;
if (SDL_QueryTexture(renderer->logical_target, NULL, NULL, &logical_w, &logical_h) < 0) {
goto error;
}
want_aspect = (float)logical_w / logical_h;
real_aspect = (float)output_w / output_h;
renderer->logical_src_rect.x = 0.0f;
renderer->logical_src_rect.y = 0.0f;
renderer->logical_src_rect.w = (float)logical_w;
@@ -2169,8 +2134,7 @@ static int UpdateLogicalPresentation(SDL_Renderer *renderer)
renderer->logical_dst_rect.h = SDL_floorf(logical_h * scale);
renderer->logical_dst_rect.y = (output_h - renderer->logical_dst_rect.h) / 2.0f;
} else if (renderer->logical_presentation_mode == SDL_LOGICAL_PRESENTATION_MATCH ||
renderer->logical_presentation_mode == SDL_LOGICAL_PRESENTATION_STRETCH ||
} else if (renderer->logical_presentation_mode == SDL_LOGICAL_PRESENTATION_STRETCH ||
SDL_fabsf(want_aspect - real_aspect) < 0.0001f) {
renderer->logical_dst_rect.x = 0.0f;
renderer->logical_dst_rect.y = 0.0f;
@@ -2238,7 +2202,7 @@ int SDL_SetRenderLogicalPresentation(SDL_Renderer *renderer, int w, int h, SDL_R
if (renderer->logical_target) {
SDL_DestroyTexture(renderer->logical_target);
}
} else if (mode != SDL_LOGICAL_PRESENTATION_MATCH) {
} else {
if (renderer->logical_target) {
int existing_w = 0, existing_h = 0;
@@ -2438,11 +2402,13 @@ int SDL_ConvertEventToRenderCoordinates(SDL_Renderer *renderer, SDL_Event *event
event->type == SDL_EVENT_FINGER_UP ||
event->type == SDL_EVENT_FINGER_MOTION) {
/* FIXME: Are these events guaranteed to be window relative? */
int w, h;
if (SDL_GetRenderWindowSize(renderer, &w, &h) < 0) {
return -1;
if (renderer->window) {
int w, h;
if (SDL_GetWindowSize(renderer->window, &w, &h) < 0) {
return -1;
}
SDL_RenderCoordinatesFromWindow(renderer, event->tfinger.x * w, event->tfinger.y * h, &event->tfinger.x, &event->tfinger.y);
}
SDL_RenderCoordinatesFromWindow(renderer, event->tfinger.x * w, event->tfinger.y * h, &event->tfinger.x, &event->tfinger.y);
}
return 0;
}