GPU Display: Support middle mouse button

Author: davidrohr

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.cxx

@@ -214,7 +214,7 @@ void GPUDisplayFrontend::focusLost()
 {
   std::fill(std::begin(mKeys), std::end(mKeys), false);
   std::fill(std::begin(mKeysShift), std::end(mKeysShift), false);
-  mMouseDn = mMouseDnR = false;
+  mMouseDn = mMouseDnR = mMouseDnM = false;
 }
 
 void GPUDisplayFrontend::applyInitialWindowState()

GPU/GPUTracking/display/frontend/GPUDisplayFrontend.h

@@ -124,6 +124,7 @@ class GPUDisplayFrontend : public GPUDisplayFrontendInterface
   // Keyboard / Mouse actions
   bool mMouseDn = false;          // Mouse button down
   bool mMouseDnR = false;         // Right mouse button down
+  bool mMouseDnM = false;         // Middle mouse button down (not used yet)
   float mMouseDnX, mMouseDnY;     // X/Y position where mouse button was pressed
   float mMouseMvX, mMouseMvY;     // Current mouse pointer position
   int32_t mMouseWheel = 0;        // Incremental value of mouse wheel, ca +/- 100 per wheel tick

GPU/GPUTracking/display/frontend/GPUDisplayFrontendGlfw.cxx

@@ -207,6 +207,8 @@ void GPUDisplayFrontendGlfw::mouseButton_callback(GLFWwindow* window, int32_t bu
       me->mMouseDn = true;
     } else if (button == 1) {
       me->mMouseDnR = true;
+    } else if (button == GLFW_MOUSE_BUTTON_MIDDLE) {
+      me->mMouseDnM = true;
     }
     me->mMouseDnX = me->mMouseMvX;
     me->mMouseDnY = me->mMouseMvY;
@@ -215,6 +217,8 @@ void GPUDisplayFrontendGlfw::mouseButton_callback(GLFWwindow* window, int32_t bu
       me->mMouseDn = false;
     } else if (button == 1) {
       me->mMouseDnR = false;
+    } else if (button == GLFW_MOUSE_BUTTON_MIDDLE) {
+      me->mMouseDnM = false;
     }
   }
 }

GPU/GPUTracking/display/frontend/GPUDisplayFrontendGlut.cxx

@@ -195,6 +195,8 @@ void GPUDisplayFrontendGlut::mouseFunc(int32_t button, int32_t state, int32_t x,
       me->mMouseDn = true;
     } else if (button == GLUT_RIGHT_BUTTON) {
       me->mMouseDnR = true;
+    } else if (button == GLUT_MIDDLE_BUTTON) {
+      me->mMouseDnM = true;
     }
     me->mMouseDnX = x;
     me->mMouseDnY = y;
@@ -203,6 +205,8 @@ void GPUDisplayFrontendGlut::mouseFunc(int32_t button, int32_t state, int32_t x,
       me->mMouseDn = false;
     } else if (button == GLUT_RIGHT_BUTTON) {
       me->mMouseDnR = false;
+    } else if (button == GLUT_MIDDLE_BUTTON) {
+      me->mMouseDnM = false;
     }
   }
 }

GPU/GPUTracking/display/frontend/GPUDisplayFrontendWayland.cxx

@@ -158,7 +158,7 @@ int32_t GPUDisplayFrontendWayland::FrontendMain()
   };
   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;
+    me->mMouseDn = me->mMouseDnR = me->mMouseDnM = 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;
@@ -172,6 +172,8 @@ int32_t GPUDisplayFrontendWayland::FrontendMain()
         me->mMouseDnR = true;
       } else if (button == BTN_LEFT) {
         me->mMouseDn = true;
+      } else if (button == BTN_MIDDLE) {
+        me->mMouseDnM = true;
       }
       me->mMouseDnX = me->mMouseMvX;
       me->mMouseDnY = me->mMouseMvY;
@@ -180,6 +182,8 @@ int32_t GPUDisplayFrontendWayland::FrontendMain()
         me->mMouseDnR = false;
       } else if (button == BTN_LEFT) {
         me->mMouseDn = false;
+      } else if (button == BTN_MIDDLE) {
+        me->mMouseDnM = false;
       }
     }
   };

GPU/GPUTracking/display/frontend/GPUDisplayFrontendX11.cxx

@@ -349,6 +349,8 @@ int32_t GPUDisplayFrontendX11::FrontendMain()
           } else {
             if (event.xbutton.button == 1) {
               mMouseDn = true;
+            } else if (event.xbutton.button == 2) {
+              mMouseDnM = true;
             } else {
               mMouseDnR = true;
             }
@@ -362,6 +364,8 @@ int32_t GPUDisplayFrontendX11::FrontendMain()
           if (event.xbutton.button != 4 && event.xbutton.button != 5) {
             if (event.xbutton.button == 1) {
               mMouseDn = false;
+            } else if (event.xbutton.button == 2) {
+              mMouseDnM = false;
             } else {
               mMouseDnR = false;
             }