GPU Display Console: Add the possibility to rebind keys

Author: davidrohr

GPU/GPUTracking/DataTypes/GPUTPCGeometry.h

@@ -121,8 +121,7 @@ class GPUTPCGeometry
   GPUd() static constexpr int32_t MaxNPadsPerRow() { return 138; }
   GPUd() static constexpr float PadWidth(int32_t row) { return (gputpcgeometry_internal::mPadWidthRow[row]); }
 #else
-  GPUd() static constexpr int32_t GetRegion(int32_t row) { return (row < 63 ? 0 : row < 63 + 64 ? 1
-                                                                                                : 2); }
+  GPUd() static constexpr int32_t GetRegion(int32_t row) { return (row < 63 ? 0 : row < 63 + 64 ? 1 : 2); }
   GPUd() static constexpr int32_t GetRegionRows(int32_t region) { return 0; }  // dummy
   GPUd() static constexpr int32_t GetRegionStart(int32_t region) { return 0; } // dummy
   GPUd() static constexpr int32_t GetROC(int32_t row) { return GetRegion(row); }

GPU/GPUTracking/Definitions/GPUSettingsListDisplay.h

@@ -116,8 +116,8 @@ EndConfig()
 BeginSubConfig(GPUSettingsDisplayInternal, internal, configStandalone.display, "GLI", 0, "Internal display settings", display_internal)
 AddOption(guiReplyTimeout, uint32_t, 100, "", 0, "Time in ms the Qt GUI waits at most for the display to process its update")
 AddOption(guiMaxUpdatesAhead, uint32_t, 3, "", 0, "Number of updates the Qt GUI may send ahead of the last one the display has processed, before it waits for the display")
-AddOption(consoleDelay, float, 0.5f, "", 0, "Time in seconds to open / close the console (^ key)")
-AddOption(consoleAlpha, float, 0.8f, "", 0, "Opacity of the console background")
+AddOption(consoleDelay, float, 0.3f, "", 0, "Time in seconds to open / close the console (^ key)")
+AddOption(consoleAlpha, float, 0.85f, "", 0, "Opacity of the console background")
 AddOption(consoleVertical, float, 0.5f, "", 0, "Fraction of the window height covered by the fully opened console")
 AddOption(consoleHistorySize, uint32_t, 1000000, "", 0, "Number of console lines kept, the history is shortened to this when it reaches twice the size")
 AddOption(setInfoTime, float, 5.0f, "", 0, "Time in seconds an info message (SetInfo) is shown fully opaque")

GPU/GPUTracking/Merger/GPUTPCGlobalDebugSortKernels.cxx

@@ -52,8 +52,9 @@ GPUdii() void GPUTPCGlobalDebugSortKernels::Thread<GPUTPCGlobalDebugSortKernels:
     GPUCommonAlgorithm::sort(tmp, tmp + n, [&merger, offset](const int32_t& aa, const int32_t& bb) {
       const auto& a = merger.SectorTrackInfos()[offset + aa];
       const auto& b = merger.SectorTrackInfos()[offset + bb];
-      return (a.X() != b.X()) ? (a.X() < b.X()) : (a.Y() != b.Y()) ? (a.Y() < b.Y())
-                                                                   : (a.Z() < b.Z());
+      return (a.X() != b.X())   ? (a.X() < b.X())
+             : (a.Y() != b.Y()) ? (a.Y() < b.Y())
+                                : (a.Z() < b.Z());
     });
     for (int32_t j = 0; j < n; j++) {
       if (tmp[j] >= 0 && tmp[j] != j) {

GPU/GPUTracking/display/backend/GPUDisplayBackendVulkan.cxx

@@ -813,8 +813,7 @@ void GPUDisplayBackendVulkan::createSwapChain(vk::SwapchainKHR oldSwapChain)
   { // Let the compositor scale the last image while resizing, until the new swapchain is presented
     const vk::SurfacePresentModeKHR surfacePresentMode{mPresentMode};
     const auto caps = mPhysicalDevice.getSurfaceCapabilities2KHR<vk::SurfaceCapabilities2KHR, vk::SurfacePresentScalingCapabilitiesKHR>(vk::PhysicalDeviceSurfaceInfo2KHR{mSurface, &surfacePresentMode}).get<vk::SurfacePresentScalingCapabilitiesKHR>();
-    auto gravity = [](vk::PresentGravityFlagsKHR f) { return (f & vk::PresentGravityFlagBitsKHR::eCentered) ? vk::PresentGravityFlagBitsKHR::eCentered : (f & vk::PresentGravityFlagBitsKHR::eMin) ? vk::PresentGravityFlagBitsKHR::eMin
-                                                                                                                                                                                                   : vk::PresentGravityFlagsKHR(f & vk::PresentGravityFlagBitsKHR::eMax); };
+    auto gravity = [](vk::PresentGravityFlagsKHR f) { return (f & vk::PresentGravityFlagBitsKHR::eCentered) ? vk::PresentGravityFlagBitsKHR::eCentered : (f & vk::PresentGravityFlagBitsKHR::eMin) ? vk::PresentGravityFlagBitsKHR::eMin : vk::PresentGravityFlagsKHR(f & vk::PresentGravityFlagBitsKHR::eMax); };
     scalingInfo.scalingBehavior = (caps.supportedPresentScaling & vk::PresentScalingFlagBitsKHR::eAspectRatioStretch) ? vk::PresentScalingFlagBitsKHR::eAspectRatioStretch : vk::PresentScalingFlagsKHR(caps.supportedPresentScaling & vk::PresentScalingFlagBitsKHR::eStretch);
     scalingInfo.presentGravityX = gravity(caps.supportedPresentGravityX);
     scalingInfo.presentGravityY = gravity(caps.supportedPresentGravityY);

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.h

@@ -24,6 +24,7 @@
 #include <mutex>
 #include <thread>
 #include <condition_variable>
+#include <functional>
 #include <string>
 #include <utility>
 #include <vector>
@@ -157,8 +158,7 @@ class GPUDisplayFrontend : public GPUDisplayFrontendInterface, public GPUDisplay
  private:
   struct GPUDisplayConfiguration;
   struct configRTTIExt;
-  struct configKey;
-  std::unique_ptr<GPUDisplayConfiguration, void (*)(GPUDisplayConfiguration*)> mConfigRTTI{nullptr, nullptr}; // Deleter set in GPUDisplayFrontendConfig.cxx, the only place where GPUDisplayConfiguration is defined
+  std::unique_ptr<GPUDisplayConfiguration, void (*)(GPUDisplayConfiguration*)> mConfiguration{nullptr, nullptr}; // Deleter set in GPUDisplayFrontendConfig.cxx, the only place where GPUDisplayConfiguration is defined
 
   void HandleExternalGUIKeys();
   static int32_t translateExternalKey(uint32_t translationMode, uint64_t extendedKey); // Key code of an encoded key of sendExternalGUIKey (+ SPECIAL_KEYS_SHIFTED with SHIFT), -1 if unknown
@@ -172,7 +172,8 @@ class GPUDisplayFrontend : public GPUDisplayFrontendInterface, public GPUDisplay
   void setGUILayout(GPUDisplayGUIChannel& channel) const; // Copy the GUI elements of the add_gui_binding calls to the channel
   void applyGUIValues(const GPUDisplayGUIUpdate& update); // Call the setter of the GUI elements changed in the GUI (element id, value), and show the info of their options
   void listConfig();
-  const std::vector<std::string>& getHelpText() const; // Help text of all key bindings, one line per binding
+  const std::vector<std::string>& getHelpText();                       // Help text of all key bindings, one line per binding, rebuilt after key bindings changed
+  void listKeys(const std::function<void(const std::string&)>& print); // Bound keys with action / key down mapping and option, then unbound actions and mappings, then the key down mappings with their keys, one line per call
 };
 } // namespace o2::gpu