Ticket #2349: highdpi2.patch

binaries/data/config/default.cfg

@@ -56 +56 @@
 ; Force a non-standard bit depth (if 0 then use the current desktop bit depth)
 bpp = 0
 
+; Render at high-dpi resolution if screen supports it. Will be much slower.
+high_dpi = false
+
 ; Preferred display (for multidisplay setups, only works with SDL 2.0)
 display = 0
 

source/gui/CGUI.cpp

@@ -80 +80 @@
         // Yes the mouse position is stored as float to avoid
         //  constant conversions when operating in a
         //  float-based environment.
-        m_MousePos = CPos((float)ev->ev.motion.x * g_GuiScale, (float)ev->ev.motion.y * g_GuiScale);
+        m_MousePos = CPos((float)ev->ev.motion.x * g_GuiScale * g_DpiScale, (float)ev->ev.motion.y * g_GuiScale * g_DpiScale);
 
         SGUIMessage msg(GUIM_MOUSE_MOTION);
         GUI<SGUIMessage>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject,
@@ -107 +107 @@
     CPos oldMousePos = m_MousePos;
     if (ev->ev.type == SDL_MOUSEBUTTONDOWN || ev->ev.type == SDL_MOUSEBUTTONUP)
     {
-        m_MousePos = CPos((float)ev->ev.button.x * g_GuiScale, (float)ev->ev.button.y * g_GuiScale);
+        m_MousePos = CPos((float)ev->ev.button.x * g_GuiScale * g_DpiScale, (float)ev->ev.button.y * g_GuiScale * g_DpiScale);
     }
 
     // Only one object can be hovered

source/gui/scripting/GuiScriptConversions.cpp

@@ -27 +27 @@
     // ignore JS_SetProperty return value, because errors should be impossible
     // and we can't do anything useful in the case of errors anyway
 
+extern float g_DpiScale;
+
 template<> void ScriptInterface::ToJSVal<SDL_Event_>(JSContext* cx, JS::MutableHandleValue ret, SDL_Event_ const& val)
 {
     JSAutoRequest rq(cx);
@@ -87 +89 @@
     {
         // SET(obj, "which", (int)val.ev.motion.which); // (not in wsdl.h)
         // SET(obj, "state", (int)val.ev.motion.state); // (not in wsdl.h)
-        SET(obj, "x", (int)val.ev.motion.x);
-        SET(obj, "y", (int)val.ev.motion.y);
+        SET(obj, "x", (int)val.ev.motion.x * g_DpiScale);
+        SET(obj, "y", (int)val.ev.motion.y * g_DpiScale);
         // SET(obj, "xrel", (int)val.ev.motion.xrel); // (not in wsdl.h)
         // SET(obj, "yrel", (int)val.ev.motion.yrel); // (not in wsdl.h)
         break;
@@ -99 +101 @@
         // SET(obj, "which", (int)val.ev.button.which); // (not in wsdl.h)
         SET(obj, "button", (int)val.ev.button.button);
         SET(obj, "state", (int)val.ev.button.state);
-        SET(obj, "x", (int)val.ev.button.x);
-        SET(obj, "y", (int)val.ev.button.y);
+        SET(obj, "x", (int)val.ev.button.x * g_DpiScale);
+        SET(obj, "y", (int)val.ev.button.y * g_DpiScale);
         break;
     }
     case SDL_HOTKEYDOWN:

source/ps/GameSetup/Config.cpp

@@ -61 +61 @@
 
 int g_xres, g_yres;
 float g_GuiScale = 1.0f;
+float g_DpiScale = 1.0f;
 bool g_VSync = false;
 
 bool g_Quickstart = false;

source/ps/GameSetup/Config.h

@@ -86 +86 @@
 
 extern int g_xres, g_yres;
 extern float g_GuiScale;
+extern float g_DpiScale;
 extern bool g_VSync;
 
 extern bool g_Quickstart;

source/ps/Globals.cpp

@@ -69 +69 @@
         return IN_PASS;
 
     case SDL_MOUSEMOTION:
-        g_mouse_x = ev->ev.motion.x;
-        g_mouse_y = ev->ev.motion.y;
+        g_mouse_x = ev->ev.motion.x * g_DpiScale;
+        g_mouse_y = ev->ev.motion.y * g_DpiScale;
         return IN_PASS;
 
     case SDL_MOUSEBUTTONDOWN:

source/ps/VideoMode.cpp

@@ -49 +49 @@
 CVideoMode::CVideoMode() :
     m_IsFullscreen(false), m_IsInitialised(false), m_Window(NULL),
     m_PreferredW(0), m_PreferredH(0), m_PreferredBPP(0), m_PreferredFreq(0),
-    m_ConfigW(0), m_ConfigH(0), m_ConfigBPP(0), m_ConfigFullscreen(false), m_ConfigForceS3TCEnable(true),
+    m_ConfigW(0), m_ConfigH(0), m_ConfigBPP(0), m_ConfigHighDPI(false), m_ConfigFullscreen(false), m_ConfigForceS3TCEnable(true),
     m_WindowedW(DEFAULT_WINDOW_W), m_WindowedH(DEFAULT_WINDOW_H), m_WindowedX(0), m_WindowedY(0)
 {
     // (m_ConfigFullscreen defaults to false, so users don't get stuck if
@@ -64 +64 @@
 
     CFG_GET_VAL("xres", m_ConfigW);
     CFG_GET_VAL("yres", m_ConfigH);
+    CFG_GET_VAL("high_dpi", m_ConfigHighDPI);
     CFG_GET_VAL("bpp", m_ConfigBPP);
     CFG_GET_VAL("display", m_ConfigDisplay);
     CFG_GET_VAL("force_s3tc_enable", m_ConfigForceS3TCEnable);
@@ -79 +80 @@
     {
         // Note: these flags only take affect in SDL_CreateWindow
         flags |= SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE;
+        if (m_ConfigHighDPI)
+            flags |= SDL_WINDOW_ALLOW_HIGHDPI;
         m_WindowedX = m_WindowedY = SDL_WINDOWPOS_CENTERED_DISPLAY(m_ConfigDisplay);
 
         m_Window = SDL_CreateWindow("0 A.D.", m_WindowedX, m_WindowedY, w, h, flags);
@@ -147 +150 @@
     // Grab the current video settings
     SDL_GetWindowSize(m_Window, &m_CurrentW, &m_CurrentH);
     m_CurrentBPP = bpp;
+    LOGMESSAGE("Window Size: %dx%d", m_CurrentW, m_CurrentH);
+    
+    // This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI drawable
+    int drawingWidth, drawingHeight;
+    SDL_GL_GetDrawableSize(m_Window, &drawingWidth, &drawingHeight);
+    LOGMESSAGE("Drawable Size: %dx%d", drawingWidth, drawingHeight);
+
+    UpdateRenderer();
 
     if (fullscreen)
         SDL_SetWindowGrab(m_Window, SDL_TRUE);
@@ -155 +166 @@
 
     m_IsFullscreen = fullscreen;
 
-    g_xres = m_CurrentW;
-    g_yres = m_CurrentH;
-
     return true;
 }
 
@@ -325 +333 @@
 
     m_WindowedW = w;
     m_WindowedH = h;
-
-    UpdateRenderer(w, h);
-
+    
     return true;
 }
 
@@ -370 +376 @@
         if (!SetVideoMode(w, h, bpp, fullscreen))
             return false;
 
-        UpdateRenderer(m_CurrentW, m_CurrentH);
-
         return true;
     }
     else
@@ -386 +390 @@
         if (!SetVideoMode(w, h, bpp, fullscreen))
             return false;
 
-        UpdateRenderer(w, h);
-
         return true;
     }
 }
@@ -406 +408 @@
     }
 }
 
+void CVideoMode::UpdateRenderer() {
+    // This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI drawable
+    int drawingWidth, drawingHeight;
+    SDL_GL_GetDrawableSize(m_Window, &drawingWidth, &drawingHeight);
+    UpdateRenderer(drawingWidth, drawingHeight);
+
+    g_xres = drawingWidth;
+    g_yres = drawingHeight;
+    g_GuiScale = m_CurrentW / ((float)drawingWidth);
+    g_DpiScale = ((float)drawingWidth) / m_CurrentW;
+}
+
 void CVideoMode::UpdateRenderer(int w, int h)
 {
     if (w < 2) w = 2; // avoid GL errors caused by invalid sizes

source/ps/VideoMode.h

@@ -62 +62 @@
      */
     void UpdatePosition(int x, int y);
 
+    /**
+     * Update the graphics code to start drawing to the new size set for the SDL context.
+     * This should be called after the GL context has been resized.
+     */
+    void UpdateRenderer();
+
     /**
-     * Update the graphics code to start drawing to the new size.
+     * Update the graphics code to start drawing to the specified size.
      * This should be called after the GL context has been resized.
      * This can also be used when the GL context is managed externally, not via SDL.
      */
@@ -105 +111 @@
     int m_ConfigW;
     int m_ConfigH;
     int m_ConfigBPP;
+    bool m_ConfigHighDPI;
     int m_ConfigDisplay;
     bool m_ConfigFullscreen;
     bool m_ConfigForceS3TCEnable;