GPU Display: Release keys / mouse buttons when focus lost

Author: davidrohr

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.cxx

@@ -40,6 +40,8 @@ GPUDisplayFrontend* createGPUDisplayFrontendWayland();
 
 #include "GPULogging.h"
 #include <cstring>
+#include <algorithm>
+#include <iterator>
 #include <thread>
 
 #ifdef GPUCA_BUILD_EVENT_DISPLAY_QT
@@ -201,6 +203,13 @@ void GPUDisplayFrontend::setWindowState(bool fullScreen, bool maximized)
   mDisplay->mCfgR.maximized = maximized;
 }
 
+void GPUDisplayFrontend::focusLost()
+{
+  std::fill(std::begin(mKeys), std::end(mKeys), false);
+  std::fill(std::begin(mKeysShift), std::end(mKeysShift), false);
+  mMouseDn = mMouseDnR = false;
+}
+
 void GPUDisplayFrontend::applyInitialWindowState()
 {
   if (mDisplay->cfgR().fullScreen) {

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.h

@@ -152,6 +152,7 @@ class GPUDisplayFrontend : public GPUDisplayFrontendInterface
   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 focusLost();                                     // Release all keys and mouse buttons when the window loses focus, since the release events go to another window
   void applyInitialWindowState();                       // Switch to fullscreen / maximize at startup according to the settings
 };
 } // namespace o2::gpu

GPU/GPUTracking/display/frontend/GPUDisplayFrontendGlfw.cxx

@@ -229,6 +229,13 @@ 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::focus_callback(GLFWwindow* window, int32_t focused)
+{
+  if (!focused) {
+    me->focusLost();
+  }
+}
+
 void GPUDisplayFrontendGlfw::maximize_callback(GLFWwindow* window, int32_t maximized) { me->setWindowState(glfwGetWindowMonitor(window) != nullptr, maximized); }
 
 #ifndef GPUCA_STANDALONE
@@ -279,6 +286,7 @@ int32_t GPUDisplayFrontendGlfw::FrontendMain()
   glfwSetCursorPosCallback(mWindow, cursorPos_callback);
   glfwSetWindowSizeCallback(mWindow, resize_callback);
   glfwSetWindowMaximizeCallback(mWindow, maximize_callback);
+  glfwSetWindowFocusCallback(mWindow, focus_callback);
   applyInitialWindowState();
   if (backend()->backendType() == GPUDisplayBackend::TYPE_OPENGL) {
     glfwSwapInterval(1);

GPU/GPUTracking/display/frontend/GPUDisplayFrontendGlfw.h

@@ -50,6 +50,7 @@ class GPUDisplayFrontendGlfw : public GPUDisplayFrontend
   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 void focus_callback(GLFWwindow* mWindow, int32_t focused);
   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/GPUDisplayFrontendWayland.cxx

@@ -156,6 +156,8 @@ int32_t GPUDisplayFrontendWayland::FrontendMain()
   auto pointer_enter = [](void* data, wl_pointer* wl_pointer, uint32_t serial, wl_surface* surface, wl_fixed_t surface_x, wl_fixed_t surface_y) {
   };
   auto pointer_leave = [](void* data, wl_pointer* wl_pointer, uint32_t serial, wl_surface* wl_surface) {
+    GPUDisplayFrontendWayland* me = (GPUDisplayFrontendWayland*)data;
+    me->mMouseDn = me->mMouseDnR = false;
   };
   auto pointer_motion = [](void* data, wl_pointer* wl_pointer, uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
     GPUDisplayFrontendWayland* me = (GPUDisplayFrontendWayland*)data;
@@ -192,7 +194,7 @@ int32_t GPUDisplayFrontendWayland::FrontendMain()
   };
   auto pointer_axis_source = [](void* data, wl_pointer* wl_pointer, uint32_t axis_source) {};
   auto pointer_axis_stop = [](void* data, wl_pointer* wl_pointer, uint32_t time, uint32_t axis) {};
-  auto pointer_axis_discrete = [](void* data, wl_pointer* wl_pointer, uint32_t axis, int32_t discrete) {}; // Only sent for seat versions 5 to 7, superseded by axis_value120
+  auto pointer_axis_discrete = [](void* data, wl_pointer* wl_pointer, uint32_t axis, int32_t discrete) {};
 #ifdef WL_POINTER_AXIS_VALUE120_SINCE_VERSION
   auto pointer_axis_value120 = [](void* data, wl_pointer* wl_pointer, uint32_t axis, int32_t value120) {
     GPUDisplayFrontendWayland* me = (GPUDisplayFrontendWayland*)data;
@@ -223,7 +225,11 @@ int32_t GPUDisplayFrontendWayland::FrontendMain()
     close(fd);
   };
   auto keyboard_enter = [](void* data, wl_keyboard* wl_keyboard, uint32_t serial, wl_surface* surface, wl_array* keys) {};
-  auto keyboard_leave = [](void* data, wl_keyboard* wl_keyboard, uint32_t serial, wl_surface* surface) {};
+  auto keyboard_leave = [](void* data, wl_keyboard* wl_keyboard, uint32_t serial, wl_surface* surface) {
+    GPUDisplayFrontendWayland* me = (GPUDisplayFrontendWayland*)data;
+    me->focusLost();
+    me->mRepeatKeyCode = -1;
+  };
   auto keyboard_key = [](void* data, wl_keyboard* wl_keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) {
     GPUDisplayFrontendWayland* me = (GPUDisplayFrontendWayland*)data;
     int32_t symbol = me->GetKey(key, state);

GPU/GPUTracking/display/frontend/GPUDisplayFrontendX11.cxx

@@ -392,6 +392,11 @@ int32_t GPUDisplayFrontendX11::FrontendMain()
           break;
         }
 
+        case FocusOut: {
+          focusLost();
+          break;
+        }
+
         case PropertyNotify: {
           if (event.xproperty.atom == XInternAtom(mXDisplay, "_NET_WM_STATE", False)) {
             updateWindowState();