GPU Wayland Display: Refactoring for correct windows / pixel sizes with HighDPI screen and scaling, fixed maximized windows, several other fixes by Claude

Author: davidrohr

GPU/GPUTracking/Definitions/GPUSettingsList.h

@@ -499,7 +499,7 @@ AddOption(camLookOrigin, bool, false, "", 0, "Make the camera look at the origin
 AddOption(camYUp, bool, false, "", 0, "Orient the camera such that the y-axis is always upwards")
 AddOption(cameraMode, int32_t, 0, "", 0, "Camera mode")
 AddOption(fullScreen, bool, false, "", 0, "Full Screen")
-AddOption(maximized, bool, false, "", 0, "Full Screen")
+AddOption(maximized, bool, true, "", 0, "Maximized window")
 AddOption(openGLCore, bool, false, "", 0, "Use renderer path for OpenGL core profile")
 AddOption(drawQualityMSAA, int32_t, 0, "", 0, "MultiSample Anti Aliasing")
 AddOption(drawQualityDownsampleFSAA, int32_t, 0, "", 0, "Downsampling Anti Aliasing")

GPU/GPUTracking/display/GPUDisplay.h

@@ -41,6 +41,8 @@ class GPUTPCGMPropagator;
 
 class GPUDisplay : public GPUDisplayInterface
 {
+  friend class GPUDisplayFrontend;
+
  public:
   GPUDisplay(GPUDisplayFrontend* frontend, GPUChainTracking* chain, GPUQA* qa, const GPUParam* param = nullptr, const GPUCalibObjectsConst* calib = nullptr, const GPUSettingsDisplay* config = nullptr, const GPUSettingsProcessing* proc = nullptr);
   GPUDisplay(const GPUDisplay&) = delete;

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.cxx

@@ -31,7 +31,10 @@
 #include "GPUDisplayFrontendGlut.h"
 #endif
 #ifdef GPUCA_BUILD_EVENT_DISPLAY_WAYLAND
-#include "GPUDisplayFrontendWayland.h"
+namespace o2::gpu
+{
+GPUDisplayFrontend* createGPUDisplayFrontendWayland();
+} // namespace o2::gpu
 #endif
 #include "GPUDisplayFrontendNone.h"
 
@@ -171,7 +174,7 @@ GPUDisplayFrontend* GPUDisplayFrontend::getFrontend(const char* type)
 #endif
 #ifdef GPUCA_BUILD_EVENT_DISPLAY_WAYLAND
   if (strcmp(type, "wayland") == 0 || (strcmp(type, "auto") == 0 && getenv("XDG_SESSION_TYPE") && strcmp(getenv("XDG_SESSION_TYPE"), "wayland") == 0)) {
-    return new GPUDisplayFrontendWayland;
+    return createGPUDisplayFrontendWayland();
   } else
 #endif
 #ifdef GPUCA_BUILD_EVENT_DISPLAY_GLUT
@@ -192,6 +195,21 @@ GPUDisplayBackend* GPUDisplayFrontend::backend()
   return mDisplay->backend();
 }
 
+void GPUDisplayFrontend::setWindowState(bool fullScreen, bool maximized)
+{
+  mDisplay->mCfgR.fullScreen = fullScreen;
+  mDisplay->mCfgR.maximized = maximized;
+}
+
+void GPUDisplayFrontend::applyInitialWindowState()
+{
+  if (mDisplay->cfgR().fullScreen) {
+    SwitchFullscreen(true);
+  } else if (mDisplay->cfgR().maximized) {
+    ToggleMaximized(true);
+  }
+}
+
 int32_t& GPUDisplayFrontend::drawTextFontSize()
 {
   return mDisplay->drawTextFontSize();

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.h

@@ -62,6 +62,7 @@ class GPUDisplayFrontend : public GPUDisplayFrontendInterface
   GPUDisplayBackend* backend();
   static GPUDisplayFrontend* getFrontend(const char* type);
   virtual void getSize(int32_t& width, int32_t& height) { width = height = 0; }
+  virtual float getDisplayScale() const { return 1.f; } // HiDPI scale factor: physical pixels per logical pixel, text positions and sizes are scaled by it
   virtual int32_t getVulkanSurface(void* instance, void* surface) { return 1; }
   virtual uint32_t getReqVulkanExtensions(const char**& p) { return 0; };
 
@@ -150,6 +151,8 @@ class GPUDisplayFrontend : public GPUDisplayFrontendInterface
   int32_t InitDisplay(bool initFailure = false);   // Callback to initialize the GL Display (to be called in StartDisplay)
   void ExitDisplay();                              // Callback to clean up the GL Display
   int32_t& drawTextFontSize();
+  void setWindowState(bool fullScreen, bool maximized); // Sync the settings if the window manager changed the window state
+  void applyInitialWindowState();                       // Switch to fullscreen / maximize at startup according to the settings
 };
 } // namespace o2::gpu
 

GPU/GPUTracking/display/frontend/GPUDisplayFrontendGlfw.cxx

@@ -229,6 +229,8 @@ void GPUDisplayFrontendGlfw::cursorPos_callback(GLFWwindow* window, double x, do
 
 void GPUDisplayFrontendGlfw::resize_callback(GLFWwindow* window, int32_t width, int32_t height) { me->ResizeScene(width, height); }
 
+void GPUDisplayFrontendGlfw::maximize_callback(GLFWwindow* window, int32_t maximized) { me->setWindowState(glfwGetWindowMonitor(window) != nullptr, maximized); }
+
 #ifndef GPUCA_STANDALONE
 void GPUDisplayFrontendGlfw::DisplayLoop()
 {
@@ -251,7 +253,6 @@ int32_t GPUDisplayFrontendGlfw::FrontendMain()
   }
   glfwSetErrorCallback(error_callback);
 
-  glfwWindowHint(GLFW_MAXIMIZED, 1);
   if (backend()->backendType() == GPUDisplayBackend::TYPE_VULKAN) {
     glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
   }
@@ -277,6 +278,8 @@ int32_t GPUDisplayFrontendGlfw::FrontendMain()
   glfwSetScrollCallback(mWindow, scroll_callback);
   glfwSetCursorPosCallback(mWindow, cursorPos_callback);
   glfwSetWindowSizeCallback(mWindow, resize_callback);
+  glfwSetWindowMaximizeCallback(mWindow, maximize_callback);
+  applyInitialWindowState();
   if (backend()->backendType() == GPUDisplayBackend::TYPE_OPENGL) {
     glfwSwapInterval(1);
   }

GPU/GPUTracking/display/frontend/GPUDisplayFrontendGlfw.h

@@ -49,6 +49,7 @@ class GPUDisplayFrontendGlfw : public GPUDisplayFrontend
   static void scroll_callback(GLFWwindow* mWindow, double x, double y);
   static void cursorPos_callback(GLFWwindow* mWindow, double x, double y);
   static void resize_callback(GLFWwindow* mWindow, int32_t width, int32_t height);
+  static void maximize_callback(GLFWwindow* mWindow, int32_t maximized);
   static int32_t GetKey(int32_t key);
   static void GetKey(int32_t keyin, int32_t scancode, int32_t mods, int32_t& keyOut, int32_t& keyPressOut);
 

GPU/GPUTracking/display/frontend/GPUDisplayFrontendGlut.cxx

@@ -259,7 +259,7 @@ int32_t GPUDisplayFrontendGlut::FrontendMain()
   glutMotionFunc(mouseMoveFunc);
   glutPassiveMotionFunc(mouseMoveFunc);
   glutMouseWheelFunc(mMouseWheelFunc);
-  ToggleMaximized(true);
+  applyInitialWindowState();
 
   pthread_mutex_lock(&mSemLockExit);
   mDisplayRunning = true;