Added support for scaling the output

* Added "Scale" user option, which can either by "Auto" or an explicit
  scaling factor. Its maximum value depends on the current resolution.

  The "Auto" factor is based on keeping the logical resolution on at
  least 800x600, wheres the maximum scale is based on keeping the
  logical resolution on at least 640x480.

* Enabled support for High DPI. This means the rendering target can now
  have a different resolution than the window size, which can happen on
  macOS, Windows and Wayland. The resulting scale is multiplied by the
  above user-controlled scale.

  Currently, this looks ugly for non-integer scales, which are not used
  on macOS and can only be configured on some Wayland compositors.

  Has not been tested on Windows.

* Simplified OpenGL initialization (moved out of _beginDraw).

* Made sure _beginDraw/_endDraw sets a clip area also for SDLGraphics.

1 files changed, 16 insertions, 9 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 1348112d..eac55c83 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -310,6 +310,7 @@ Client::Client(const Options &options):
     videoSettings.windowMode = static_cast<WindowMode>(config.getIntValue("windowmode"));
     videoSettings.width = config.getIntValue("screenwidth");
     videoSettings.height = config.getIntValue("screenheight");
+    videoSettings.userScale = config.getIntValue("scale");
     videoSettings.vsync = config.getBoolValue("vsync");
     videoSettings.openGL = useOpenGL;
 
@@ -348,9 +349,6 @@ Client::Client(const Options &options):
     }
 #endif
 
-    // Initialize for drawing
-    graphics->_beginDraw();
-
     Theme::prepareThemePath();
 
     // Initialize the item and emote shortcuts.
@@ -508,7 +506,8 @@ int Client::exec()
                 case SDL_WINDOWEVENT:
                     switch (event.window.event) {
                     case SDL_WINDOWEVENT_SIZE_CHANGED:
-                        videoResized(event.window.data1, event.window.data2);
+                        handleWindowSizeChanged(event.window.data1,
+                                                event.window.data2);
                         break;
                     }
                     break;
@@ -1322,17 +1321,25 @@ void Client::accountLogin(LoginData *loginData)
     config.setValue("remember", loginData->remember);
 }
 
-void Client::videoResized(int width, int height)
+void Client::handleWindowSizeChanged(int width, int height)
 {
     // Store the new size in the configuration.
     config.setValue("screenwidth", width);
     config.setValue("screenheight", height);
 
-    graphics->videoResized(width, height);
+    mVideo.windowSizeChanged(width, height);
+
+    checkGraphicsSize();
+}
+
+void Client::checkGraphicsSize()
+{
+    const int width = graphics->getWidth();
+    const int height = graphics->getHeight();
 
-    // Logical size might be different from physical
-    width = graphics->getWidth();
-    height = graphics->getHeight();
+    const auto guiTop = gui->getTop();
+    if (guiTop->getWidth() == width && guiTop->getHeight() == height)
+        return;
 
     gui->videoResized(width, height);