Implement DPI scaling for Windows (#9586)

diff --git a/misc/minetest.exe.manifest b/misc/minetest.exe.manifest
index 3c32b0f8b2cab99e3c63262cccf527f51bfdd434..18f8c85f4f3880da92e29a43f6ca0aa4c7f417e4 100644 (file)
--- a/misc/minetest.exe.manifest
+++ b/misc/minetest.exe.manifest
@@ -8,8 +8,8 @@
         </security>
     </trustInfo>
     <application xmlns="urn:schemas-microsoft-com:asm.v3">
-        <windowsSettings>
-            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+        <windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+            <dpiAware>true</dpiAware>
         </windowsSettings>
     </application>
 </assembly>

diff --git a/misc/winresource.rc b/misc/winresource.rc
index e1e82581b1cbe1e05b377758ce64e3700991e9be..ffb493873647e474459f78141bfa69a8f199b92b 100644 (file)
--- a/misc/winresource.rc
+++ b/misc/winresource.rc
@@ -1,6 +1,8 @@
 #include <windows.h>\r
+#include <winuser.h>\r
 #include <commctrl.h>\r
 #include <richedit.h>\r
+\r
 #ifndef USE_CMAKE_CONFIG_H\r
 #define USE_CMAKE_CONFIG_H\r
 #endif\r
@@ -13,6 +15,10 @@
        #define BUILDMODE "RUN_IN_PLACE=0"\r
 #endif\r
 \r
+#ifdef __MINGW32__\r
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "minetest.exe.manifest"\r
+#endif\r
+\r
 LANGUAGE 0, SUBLANG_NEUTRAL\r
 130        ICON         "minetest-icon.ico"\r
 \r

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ebbd628ce79bb9612e6d573aa1ad3c8237cf7a0..0b550c09c576d13044876097b2d819955438fbf7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -451,7 +451,7 @@ if(WIN32)
                        -i${WINRESOURCE_FILE}
                        -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                       DEPENDS ${WINRESOURCE_FILE})
+                       DEPENDS ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})
                SET(extra_windows_SRCS ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
        else(MINGW) # Probably MSVC
                set(extra_windows_SRCS ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})

diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
index 8b7bbf328e30ad783ee3f45c2b4c2f50dc193813..eae6ca7d3732d630c7d5ab41802c9a281afb7e89 100644 (file)
--- a/src/client/renderingengine.cpp
+++ b/src/client/renderingengine.cpp
@@ -45,7 +45,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+#endif
 
+#ifdef _WIN32
+#include <windows.h>
+#include <winuser.h>
 #endif
 
 #if ENABLE_GLES
@@ -318,6 +322,28 @@ void RenderingEngine::setupTopLevelXorgWindow(const std::string &name)
 #endif
 }
 
+#ifdef _WIN32
+static bool getWindowHandle(irr::video::IVideoDriver *driver, HWND &hWnd)
+{
+       const video::SExposedVideoData exposedData = driver->getExposedVideoData();
+
+       switch (driver->getDriverType()) {
+       case video::EDT_DIRECT3D8:
+               hWnd = reinterpret_cast<HWND>(exposedData.D3D8.HWnd);
+               break;
+       case video::EDT_DIRECT3D9:
+               hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd);
+               break;
+       case video::EDT_OPENGL:
+               hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
+               break;
+       default:
+               return false;
+       }
+
+       return true;
+}
+#endif
 
 bool RenderingEngine::setWindowIcon()
 {
@@ -335,22 +361,9 @@ bool RenderingEngine::setWindowIcon()
                                                               "-xorg-icon-128.png");
 #endif
 #elif defined(_WIN32)
-       const video::SExposedVideoData exposedData = driver->getExposedVideoData();
        HWND hWnd; // Window handle
-
-       switch (driver->getDriverType()) {
-       case video::EDT_DIRECT3D8:
-               hWnd = reinterpret_cast<HWND>(exposedData.D3D8.HWnd);
-               break;
-       case video::EDT_DIRECT3D9:
-               hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd);
-               break;
-       case video::EDT_OPENGL:
-               hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
-               break;
-       default:
+       if (!getWindowHandle(driver, hWnd))
                return false;
-       }
 
        // Load the ICON from resource file
        const HICON hicon = LoadIcon(GetModuleHandle(NULL),
@@ -632,7 +645,7 @@ const char *RenderingEngine::getVideoDriverFriendlyName(irr::video::E_DRIVER_TYP
 }
 
 #ifndef __ANDROID__
-#ifdef XORG_USED
+#if defined(XORG_USED)
 
 static float calcDisplayDensity()
 {
@@ -667,12 +680,42 @@ float RenderingEngine::getDisplayDensity()
        return cached_display_density;
 }
 
-#else  // XORG_USED
+#elif defined(_WIN32)
+
+
+static float calcDisplayDensity(irr::video::IVideoDriver *driver)
+{
+       HWND hWnd;
+       if (getWindowHandle(driver, hWnd)) {
+               HDC hdc = GetDC(hWnd);
+               float dpi = GetDeviceCaps(hdc, LOGPIXELSX);
+               ReleaseDC(hWnd, hdc);
+               return dpi / 96.0f;
+       }
+
+       /* return manually specified dpi */
+       return g_settings->getFloat("screen_dpi") / 96.0f;
+}
+
+float RenderingEngine::getDisplayDensity()
+{
+       static bool cached = false;
+       static float display_density;
+       if (!cached) {
+               display_density = calcDisplayDensity(get_video_driver());
+               cached = true;
+       }
+       return display_density;
+}
+
+#else
+
 float RenderingEngine::getDisplayDensity()
 {
        return g_settings->getFloat("screen_dpi") / 96.0;
 }
-#endif // XORG_USED
+
+#endif
 
 v2u32 RenderingEngine::getDisplaySize()
 {

diff --git a/src/constants.h b/src/constants.h
index 7636b38e0e8d10b52f8bbbc52c5816ac3d61e208..0a8b22e1552b578937c39513d504b855b5963611 100644 (file)
--- a/src/constants.h
+++ b/src/constants.h
@@ -110,10 +110,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     GUI related things
 */
 
-// TODO: implement dpi-based scaling for windows and remove this hack
-#if defined(_WIN32)
-#define TTF_DEFAULT_FONT_SIZE (18)
-#else
 #define TTF_DEFAULT_FONT_SIZE (16)
-#endif
 #define DEFAULT_FONT_SIZE (10)