hyprbars: Don't react to touch events with mismatching touchID

so you can do things with your other fingers

Author: earboxer

hyprbars/barDeco.cpp

@@ -29,7 +29,7 @@ CHyprBar::CHyprBar(PHLWINDOW pWindow) : IHyprWindowDecoration(pWindow) {
     m_pTouchDownCallback = HyprlandAPI::registerCallbackDynamic(
         PHANDLE, "touchDown", [&](void* self, SCallbackInfo& info, std::any param) { onTouchDown(info, std::any_cast<ITouch::SDownEvent>(param)); });
     m_pTouchUpCallback = HyprlandAPI::registerCallbackDynamic( //
-        PHANDLE, "touchUp", [&](void* self, SCallbackInfo& info, std::any param) { handleUpEvent(info); });
+        PHANDLE, "touchUp", [&](void* self, SCallbackInfo& info, std::any param) { onTouchUp(info, std::any_cast<ITouch::SUpEvent>(param)); });
 
     //move events
     m_pTouchMoveCallback = HyprlandAPI::registerCallbackDynamic(
@@ -126,27 +126,35 @@ void CHyprBar::onMouseButton(SCallbackInfo& info, IPointer::SButtonEvent e) {
 }
 
 void CHyprBar::onTouchDown(SCallbackInfo& info, ITouch::SDownEvent e) {
-    if (!inputIsValid())
+    // Don't do anything if you're already grabbed a window with another finger
+    if (!inputIsValid() || e.touchID != 0)
         return;
 
     handleDownEvent(info, e);
 }
 
+void CHyprBar::onTouchUp(SCallbackInfo& info, ITouch::SUpEvent e) {
+    if (!m_bDragPending || !m_bTouchEv || e.touchID != m_touchId)
+        return;
+
+    handleUpEvent(info);
+}
+
 void CHyprBar::onMouseMove(Vector2D coords) {
     // ensure proper redraws of button icons on hover when using hardware cursors
     static auto* const PICONONHOVER = (Hyprlang::INT* const*)HyprlandAPI::getConfigValue(PHANDLE, "plugin:hyprbars:icon_on_hover")->getDataStaticPtr();
     if (**PICONONHOVER)
         damageOnButtonHover();
 
-    if (!m_bDragPending || m_bTouchEv || !validMapped(m_pWindow))
+    if (!m_bDragPending || m_bTouchEv || !validMapped(m_pWindow) || m_touchId != 0)
         return;
 
     m_bDragPending = false;
     handleMovement();
 }
 
 void CHyprBar::onTouchMove(SCallbackInfo& info, ITouch::SMotionEvent e) {
-    if (!m_bDragPending || !m_bTouchEv || !validMapped(m_pWindow))
+    if (!m_bDragPending || !m_bTouchEv || !validMapped(m_pWindow) || e.touchID != m_touchId)
         return;
 
     auto PMONITOR     = m_pWindow->m_monitor.lock();
@@ -166,6 +174,8 @@ void CHyprBar::onTouchMove(SCallbackInfo& info, ITouch::SMotionEvent e) {
 
 void CHyprBar::handleDownEvent(SCallbackInfo& info, std::optional<ITouch::SDownEvent> touchEvent) {
     m_bTouchEv = touchEvent.has_value();
+    if (m_bTouchEv)
+        m_touchId = touchEvent.value().touchID;
 
     const auto PWINDOW = m_pWindow.lock();
 
@@ -243,6 +253,7 @@ void CHyprBar::handleUpEvent(SCallbackInfo& info) {
 
     m_bDragPending = false;
     m_bTouchEv     = false;
+    m_touchId      = 0;
 }
 
 void CHyprBar::handleMovement() {

hyprbars/barDeco.hpp

@@ -82,6 +82,7 @@ class CHyprBar : public IHyprWindowDecoration {
     bool                      inputIsValid();
     void                      onMouseButton(SCallbackInfo& info, IPointer::SButtonEvent e);
     void                      onTouchDown(SCallbackInfo& info, ITouch::SDownEvent e);
+    void                      onTouchUp(SCallbackInfo& info, ITouch::SUpEvent e);
     void                      onMouseMove(Vector2D coords);
     void                      onTouchMove(SCallbackInfo& info, ITouch::SMotionEvent e);
 
@@ -105,6 +106,7 @@ class CHyprBar : public IHyprWindowDecoration {
     bool                 m_bTouchEv       = false;
     bool                 m_bDragPending   = false;
     bool                 m_bCancelledDown = false;
+    int                  m_touchId        = 0;
 
     // store hover state for buttons as a bitfield
     unsigned int m_iButtonHoverState = 0;