ref: 387fcd4fa49ed888a287079c65f3c60c99b4be49
parent: bdb5c58d08eebeead15d4a8a08bae8b69c4cb0f7
parent: 5387e91e31c7fc3653b51215f76f07144656000d
author: Simon Howard <[email protected]>
date: Mon Oct 28 01:02:36 EDT 2013
Merge from trunk. Subversion-branch: /branches/v2-branch Subversion-revision: 2731
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -122,6 +122,34 @@
#endif
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+// Examine system DPI settings to determine whether to use the large font.
+
+static int Win32_UseLargeFont(void)
+{+ HDC hdc = GetDC(NULL);
+ int dpix;
+
+ if (!hdc)
+ {+ return 0;
+ }
+
+ dpix = GetDeviceCaps(hdc, LOGPIXELSX);
+ ReleaseDC(NULL, hdc);
+
+ // 144 is the DPI when using "150%" scaling. If the user has this set
+ // then consider this an appropriate threshold for using the large font.
+
+ return dpix >= 144;
+}
+
+#endif
+
static txt_font_t *FontForName(char *name)
{if (!strcmp(name, "small"))
@@ -190,10 +218,20 @@
{font = &small_font;
}
+#ifdef _WIN32
+ // On Windows we can use the system DPI settings to make a
+ // more educated guess about whether to use the large font.
+
+ else if (Win32_UseLargeFont())
+ {+ font = &large_font;
+ }
+#else
else if (info->current_w >= 1920 && info->current_h >= 1080)
{font = &large_font;
}
+#endif
else
{font = &main_font;