GPUD Display: Move frontend key number constants to separate header

Author: davidrohr

GPU/GPUTracking/display/CMakeLists.txt

@@ -132,7 +132,7 @@ set(SRCS_NO_H helpers/GPUDisplayLoader.cxx
               frontend/GPUDisplayHelp.cxx
               frontend/GPUDisplayFrontendConfig.cxx)
 
-set(HDRS_INSTALL helpers/GPUDisplayMagneticFieldConstants.h frontend/GPUDisplayFrontendKeys.h GPUDisplayControl.h GPUDisplayTypes.h)
+set(HDRS_INSTALL helpers/GPUDisplayMagneticFieldConstants.h frontend/GPUDisplayFrontendKeys.h frontend/GPUDisplayFrontendKeyVars.h GPUDisplayControl.h GPUDisplayTypes.h)
 
 if(GPUCA_EVENT_DISPLAY_VULKAN)
   set(SRCS ${SRCS} backend/GPUDisplayBackendVulkan.cxx)

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.h

@@ -17,6 +17,7 @@
 
 #include "GPUCommonDef.h"
 #include "GPUDisplayInterface.h"
+#include "GPUDisplayFrontendKeyVars.h"
 #include <memory>
 #include <chrono>
 #include <mutex>
@@ -34,10 +35,9 @@ class GPUDisplayBackend;
 class GPUDisplayGUIWrapper;
 struct GPUDisplayGUIChannel;
 
-class GPUDisplayFrontend : public GPUDisplayFrontendInterface
+class GPUDisplayFrontend : public GPUDisplayFrontendInterface, public GPUDisplayFrontendKeyVars
 {
   friend class GPUDisplay;
-  friend class GPUDisplayGUI; // Key codes
 
  public:
   GPUDisplayFrontend();
@@ -92,10 +92,6 @@ class GPUDisplayFrontend : public GPUDisplayFrontendInterface
   static constexpr int32_t INIT_WIDTH = 1024, INIT_HEIGHT = 768;                        // Initial window size, before maximizing
   static constexpr int32_t MIN_WIDTH = 200, MIN_HEIGHT = 150;                           // Minimum window size
   static constexpr const char* DISPLAY_WINDOW_NAME = "GPU CA Standalone Event Display"; // Title of event display set by backend
-  // Constant key codes for special mKeys (to unify different treatment in X11 / Windows / GLUT / etc.)
-#define GPUDisplayFrontendAddKey(code, key) static constexpr int32_t KEY_##key = code
-#define GPUDisplayFrontendKeyDownMap(code, key) static constexpr int32_t KEY_MAP_##key = code
-#include "GPUDisplayFrontendKeys.h"
   static constexpr uint32_t N_SPECIAL_KEYS = 32;
   static constexpr uint32_t SPECIAL_KEYS_SHIFTED = 255;
   static constexpr uint32_t N_TOTAL_KEYS = 256 + N_SPECIAL_KEYS;

GPU/GPUTracking/display/frontend/GPUDisplayFrontendKeyVars.h

@@ -0,0 +1,32 @@
+// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file GPUDisplayFrontendKeyVars.h
+/// \author David Rohr
+
+#ifndef GPUDISPLAYFRONTENDKEYVARS_H
+#define GPUDISPLAYFRONTENDKEYVARS_H
+
+#include <cstdint>
+
+namespace o2::gpu
+{
+class GPUDisplayFrontendKeyVars
+{
+ public:
+  // Constant key codes for special mKeys (to unify different treatment in X11 / Windows / GLUT / etc.)
+#define GPUDisplayFrontendAddKey(code, key) static constexpr int32_t KEY_##key = code
+#define GPUDisplayFrontendKeyDownMap(code, key) static constexpr int32_t KEY_MAP_##key = code
+#include "GPUDisplayFrontendKeys.h"
+};
+} // namespace o2::gpu
+
+#endif

GPU/GPUTracking/display/frontend/GPUDisplayGUI.cxx

@@ -13,7 +13,7 @@
 /// \author David Rohr
 
 #include "GPUDisplayGUI.h"
-#include "GPUDisplayFrontend.h"
+#include "GPUDisplayFrontendKeyVars.h"
 
 #include <QButtonGroup>
 #include <QCheckBox>
@@ -829,34 +829,34 @@ int32_t GPUDisplayGUI::translateKey(const QKeyEvent* event)
 {
   switch (event->key()) {
     case Qt::Key_Up:
-      return GPUDisplayFrontend::KEY_UP;
+      return GPUDisplayFrontendKeyVars::KEY_UP;
     case Qt::Key_Down:
-      return GPUDisplayFrontend::KEY_DOWN;
+      return GPUDisplayFrontendKeyVars::KEY_DOWN;
     case Qt::Key_Left:
-      return GPUDisplayFrontend::KEY_LEFT;
+      return GPUDisplayFrontendKeyVars::KEY_LEFT;
     case Qt::Key_Right:
-      return GPUDisplayFrontend::KEY_RIGHT;
+      return GPUDisplayFrontendKeyVars::KEY_RIGHT;
     case Qt::Key_PageUp:
-      return GPUDisplayFrontend::KEY_PAGEUP;
+      return GPUDisplayFrontendKeyVars::KEY_PAGEUP;
     case Qt::Key_PageDown:
-      return GPUDisplayFrontend::KEY_PAGEDOWN;
+      return GPUDisplayFrontendKeyVars::KEY_PAGEDOWN;
     case Qt::Key_Home:
-      return GPUDisplayFrontend::KEY_HOME;
+      return GPUDisplayFrontendKeyVars::KEY_HOME;
     case Qt::Key_End:
-      return GPUDisplayFrontend::KEY_END;
+      return GPUDisplayFrontendKeyVars::KEY_END;
     case Qt::Key_Insert:
-      return GPUDisplayFrontend::KEY_INSERT;
+      return GPUDisplayFrontendKeyVars::KEY_INSERT;
     case Qt::Key_Escape:
-      return GPUDisplayFrontend::KEY_ESCAPE;
+      return GPUDisplayFrontendKeyVars::KEY_ESCAPE;
     case Qt::Key_Return:
     case Qt::Key_Enter:
-      return GPUDisplayFrontend::KEY_ENTER;
+      return GPUDisplayFrontendKeyVars::KEY_ENTER;
     default:
       break;
   }
   if (event->key() >= Qt::Key_F1 && event->key() <= Qt::Key_F12) {
-    static_assert(GPUDisplayFrontend::KEY_F12 - GPUDisplayFrontend::KEY_F1 == Qt::Key_F12 - Qt::Key_F1);
-    return GPUDisplayFrontend::KEY_F1 + (event->key() - Qt::Key_F1);
+    static_assert(GPUDisplayFrontendKeyVars::KEY_F12 - GPUDisplayFrontendKeyVars::KEY_F1 == Qt::Key_F12 - Qt::Key_F1);
+    return GPUDisplayFrontendKeyVars::KEY_F1 + (event->key() - Qt::Key_F1);
   }
   const QString text = event->text();
   if (text.size() == 1 && text[0].unicode() >= 32 && text[0].unicode() < 127) { // Printable ASCII, with shift applied