We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] sdl-cocoa-dpi.patch

file_3223.txt (text/plain), 3.58 KB, created by Kirill Dmitrenko on 2016-01-07 09:17:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirill Dmitrenko

Created: 2016-01-07 09:17:55 UTC

Size: 3.58 KB

patch

obsolete

>diff -r e2343ac4788e src/video/cocoa/SDL_cocoamodes.h
>--- src/video/cocoa/SDL_cocoamodes.h	Wed Jan 06 22:39:29 2016 +0100
>+++ src/video/cocoa/SDL_cocoamodes.h	Thu Jan 07 12:10:12 2016 +0300
>@@ -37,6 +37,7 @@
> extern int Cocoa_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
> extern int Cocoa_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
> extern void Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
>+extern int Cocoa_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi, float * hpdi, float * vdpi);
> extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
> extern void Cocoa_QuitModes(_THIS);
>
>diff -r e2343ac4788e src/video/cocoa/SDL_cocoamodes.m
>--- src/video/cocoa/SDL_cocoamodes.m	Wed Jan 06 22:39:29 2016 +0100
>+++ src/video/cocoa/SDL_cocoamodes.m	Thu Jan 07 12:10:12 2016 +0300
>@@ -374,6 +374,24 @@
>     return 0;
> }
>
>+int
>+Cocoa_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi, float * hdpi, float * vdpi)
>+{
>+    const float MM_IN_INCH = 25.4f;
>+
>+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
>+
>+    CGSize displaySize = CGDisplayScreenSize(data->display);
>+    size_t pixelWidth = CGDisplayPixelsWide(data->display);
>+    size_t pixelHeight = CGDisplayPixelsHigh(data->display);
>+
>+    *ddpi = SDL_ComputeDiagonalDPI(pixelWidth, pixelHeight, displaySize.width / MM_IN_INCH, displaySize.height / MM_IN_INCH);
>+    *hdpi = pixelWidth * MM_IN_INCH / displaySize.width;
>+    *vdpi = pixelHeight * MM_IN_INCH / displaySize.height;
>+
>+    return 0;
>+}
>+
> void
> Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
> {
>@@ -419,7 +439,7 @@
>     if (IS_SNOW_LEOPARD_OR_LATER()) {
>         return CGDisplaySetDisplayMode(display, (CGDisplayModeRef) mode, NULL);
>     }
>-
>+
>     #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
>     if (!IS_SNOW_LEOPARD_OR_LATER()) {
>         return CGDisplaySwitchToMode(display, (CFDictionaryRef) mode);
>diff -r e2343ac4788e src/video/cocoa/SDL_cocoavideo.m
>--- src/video/cocoa/SDL_cocoavideo.m	Wed Jan 06 22:39:29 2016 +0100
>+++ src/video/cocoa/SDL_cocoavideo.m	Thu Jan 07 12:10:12 2016 +0300
>@@ -74,6 +74,7 @@
>     device->VideoQuit = Cocoa_VideoQuit;
>     device->GetDisplayBounds = Cocoa_GetDisplayBounds;
>     device->GetDisplayUsableBounds = Cocoa_GetDisplayUsableBounds;
>+    device->GetDisplayDPI = Cocoa_GetDisplayDPI;
>     device->GetDisplayModes = Cocoa_GetDisplayModes;
>     device->SetDisplayMode = Cocoa_SetDisplayMode;
>     device->PumpEvents = Cocoa_PumpEvents;
>diff -r e2343ac4788e test/testdisplayinfo.c
>--- test/testdisplayinfo.c	Wed Jan 06 22:39:29 2016 +0100
>+++ test/testdisplayinfo.c	Thu Jan 07 12:10:12 2016 +0300
>@@ -51,11 +51,18 @@
>     for (dpy = 0; dpy < num_displays; dpy++) {
>         const int num_modes = SDL_GetNumDisplayModes(dpy);
>         SDL_Rect rect = { 0, 0, 0, 0 };
>+        float ddpi, hdpi, vdpi;
>         int m;
>
>         SDL_GetDisplayBounds(dpy, &rect);
>         SDL_Log("%d: \"%s\" (%dx%d, (%d, %d)), %d modes.\n", dpy, SDL_GetDisplayName(dpy), rect.w, rect.h, rect.x, rect.y, num_modes);
>
>+        if (SDL_GetDisplayDPI(dpy, &ddpi, &hdpi, &vdpi) == -1) {
>+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "    DPI: failed to query (%s)\n", SDL_GetError());
>+        } else {
>+            SDL_Log("    DPI: ddpi=%f; hdpi=%f; vdpi=%f\n", ddpi, hdpi, vdpi);
>+        }
>+
>         if (SDL_GetCurrentDisplayMode(dpy, &mode) == -1) {
>             SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "    CURRENT: failed to query (%s)\n", SDL_GetError());
>         } else {

Actions: View | Diff

Attachments on bug 3223: 2356 | 2357 | 2358

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.