Merge pull request #152 from horriblename/fix/send-cancel

Re-implement send_cancel

Author: horriblename

flake.lock

@@ -1,12 +1,12 @@
 {
   description = "Hyprland plugin for touch gestures";
 
-  inputs.hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+  inputs.hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&tag=v0.42.0";
 
   outputs = {
     self,
     hyprland,
-  }: let
+  } @ inputs: let
     inherit (hyprland.inputs) nixpkgs;
     withPkgsFor = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
   in {
@@ -16,6 +16,7 @@
         inherit (self.packages.${system}) wf-touch;
       };
     in {
+      inherit inputs;
       default = hyprgrassPackage;
       hyprgrass = hyprgrassPackage;
       hyprgrassWithTests = hyprgrassPackage.override {runTests = true;};

flake.nix

@@ -11,7 +11,10 @@
 #include <hyprland/src/devices/ITouch.hpp>
 #include <hyprland/src/managers/KeybindManager.hpp>
 #include <hyprland/src/managers/LayoutManager.hpp>
+#include <hyprland/src/managers/SeatManager.hpp>
 #include <hyprland/src/managers/input/InputManager.hpp>
+#include <hyprland/src/protocols/core/Compositor.hpp>
+#include <hyprland/src/protocols/core/Seat.hpp>
 #undef private
 
 #include <algorithm>
@@ -267,23 +270,12 @@ void GestureManager::sendCancelEventsToWindows() {
         return;
     }
 
-    for (const auto& surface : this->touchedSurfaces) {
-        if (!surface)
-            continue;
-
-        // Retrieve the client from the surface
-        // wl_client* client = wl_resource_get_client(surface->resource);
-        // if (!client)
-        //     continue;
-
-        // FIXME: couldn't find replacement for g_pCompositor->m_sSeat
-        // wlr_seat_client* seat_client = wlr_seat_client_for_wl_client(g_pCompositor->m_sSeat.seat, client);
-        //
-        // if (seat_client) {
-        //     wlr_seat_touch_notify_cancel(g_pCompositor->m_sSeat.seat, seat_client);
-        // }
+    for (const auto& touch : this->touchedResources.all()) {
+        const auto t = touch.lock();
+        if (t.impl_) { // FIXME: idk how to check weak pointer validity
+            t->sendCancel();
+        }
     }
-    this->touchedSurfaces.clear();
 }
 
 // @return whether or not to inhibit further actions
@@ -295,23 +287,43 @@ bool GestureManager::onTouchDown(ITouch::SDownEvent ev) {
     // if (g_pCompositor->m_sSeat.exclusiveClient) // lock screen, I think
     //     return false;
 
-    if (!eventForwardingInhibited() && **SEND_CANCEL && g_pInputManager->m_sTouchData.touchFocusSurface) {
-        // remember which surfaces were touched, to later send cancel events
-        const auto surface = g_pInputManager->m_sTouchData.touchFocusSurface;
-        const auto TOUCHED = std::find(touchedSurfaces.begin(), touchedSurfaces.end(), surface);
-        if (TOUCHED == touchedSurfaces.end()) {
-            touchedSurfaces.push_back(surface);
-        }
-    }
     this->m_pLastTouchedMonitor =
         g_pCompositor->getMonitorFromName(!ev.device->boundOutput.empty() ? ev.device->boundOutput : "");
 
     this->m_pLastTouchedMonitor =
         this->m_pLastTouchedMonitor ? this->m_pLastTouchedMonitor : g_pCompositor->m_pLastMonitor.get();
 
-    const auto& position = m_pLastTouchedMonitor->vecPosition;
-    const auto& geometry = m_pLastTouchedMonitor->vecSize;
-    this->m_sMonitorArea = {position.x, position.y, geometry.x, geometry.y};
+    const auto& monitorPos  = m_pLastTouchedMonitor->vecPosition;
+    const auto& monitorSize = m_pLastTouchedMonitor->vecSize;
+    this->m_sMonitorArea    = {monitorPos.x, monitorPos.y, monitorSize.x, monitorSize.y};
+
+    g_pCompositor->warpCursorTo({
+        monitorPos.x + ev.pos.x * monitorSize.x,
+        monitorPos.y + ev.pos.y * monitorSize.y,
+    });
+
+    g_pInputManager->refocus();
+
+    if (!eventForwardingInhibited() && **SEND_CANCEL && g_pInputManager->m_sTouchData.touchFocusSurface) {
+        // remember which surfaces were touched, to later send cancel events
+        const auto surface = g_pInputManager->m_sTouchData.touchFocusSurface;
+
+        if (this->m_sGestureState.fingers.size() == 0) {
+            this->touchedResources.clear();
+        }
+
+        wl_client* client = surface.get()->client();
+        if (client) {
+            SP<CWLSeatResource> seat = g_pSeatManager->seatResourceForClient(client);
+
+            if (seat) {
+                auto touches = seat.get()->touches;
+                for (const auto& touch : touches) {
+                    this->touchedResources.insert(touch);
+                }
+            }
+        }
+    }
 
     // NOTE @wlr_touch_down_event.x and y uses a number between 0 and 1 to
     // represent "how many percent of screen" whereas
@@ -352,6 +364,20 @@ bool GestureManager::onTouchUp(ITouch::SUpEvent ev) {
 
     const auto BLOCK = IGestureManager::onTouchUp(gesture_event);
     if (**SEND_CANCEL) {
+        const auto surface = g_pInputManager->m_sTouchData.touchFocusSurface;
+
+        wl_client* client = surface.get()->client();
+        if (client) {
+            SP<CWLSeatResource> seat = g_pSeatManager->seatResourceForClient(client);
+
+            if (seat) {
+                auto touches = seat.get()->touches;
+                for (const auto& touch : touches) {
+                    this->touchedResources.remove(touch);
+                }
+            }
+        }
+
         return BLOCK;
     } else {
         // send_cancel is turned off; we need to rely on touchup events

src/GestureManager.cpp

@@ -1,6 +1,7 @@
 #pragma once
 #include "./gestures/Gestures.hpp"
 #include "HyprLogger.hpp"
+#include "VecSet.hpp"
 #include "gestures/Shared.hpp"
 #include <memory>
 
@@ -9,6 +10,7 @@
 #include <hyprland/src/helpers/Monitor.hpp>
 #include <hyprland/src/includes.hpp>
 #include <hyprland/src/managers/KeybindManager.hpp>
+#include <hyprland/src/protocols/core/Seat.hpp>
 #undef private
 
 #include <list>
@@ -46,7 +48,7 @@ class GestureManager : public IGestureManager {
     void handleCancelledGesture() override;
 
   private:
-    std::vector<CWeakPointer<CWLSurfaceResource>> touchedSurfaces;
+    VecSet<CWeakPointer<CWLTouchResource>> touchedResources;
     CMonitor* m_pLastTouchedMonitor;
     SMonitorArea m_sMonitorArea;
     wl_event_source* long_press_timer;

src/GestureManager.hpp

@@ -4,6 +4,6 @@
 class HyprLogger : public Logger {
   public:
     void debug(std::string s) {
-        Debug::log(INFO, s);
+        Debug::log(INFO, "[hyprgrass] {}", s);
     }
 };

src/HyprLogger.hpp

@@ -0,0 +1,43 @@
+#include "VecSet.hpp"
+
+template <class T> bool VecSet<T>::has(const T x) {
+    for (const auto& i : this->set) {
+        if (i == x) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+template <class T> bool VecSet<T>::insert(const T x) {
+    if (this->has(x)) {
+        return true;
+    }
+
+    this->set.push_back(x);
+    return false;
+}
+
+template <class T> bool VecSet<T>::remove(const T x) {
+    for (int i = 0; i < this->set.size(); i++) {
+        if (this->set[i] == x) {
+            if (i != this->set.size() - 1) {
+                this->set[i] = this->set.back();
+            }
+
+            this->set.pop_back();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+template <class T> void VecSet<T>::clear() {
+    this->set.clear();
+}
+
+template <class T> const std::vector<T>& VecSet<T>::all() const {
+    return this->set;
+}

src/VecSet.cpp

@@ -0,0 +1,27 @@
+#include <vector>
+
+#include <hyprland/src/helpers/memory/Memory.hpp>
+#include <hyprland/src/protocols/core/Seat.hpp>
+
+// Probably not compatible with move semantics, I really don't know
+template <class T> class VecSet {
+  public:
+    bool has(const T x);
+
+    // returns whether or not it already exists prior to insert
+    bool insert(const T x);
+
+    // returns whether or not x was found in the set
+    bool remove(const T x);
+
+    void clear();
+
+    const std::vector<T>& all() const;
+
+  private:
+    std::vector<T> set;
+};
+
+// For some reason if I put this anywhere else the symbols don't get compiled in.
+// C++ is a beauty
+template class VecSet<Hyprutils::Memory::CWeakPointer<CWLTouchResource>>;

src/VecSet.hpp

@@ -101,7 +101,7 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
     HyprlandAPI::addConfigValue(PHANDLE, "plugin:touch_gestures:edge_margin",
                                 Hyprlang::CConfigValue((Hyprlang::INT)10));
     HyprlandAPI::addConfigValue(PHANDLE, "plugin:touch_gestures:experimental:send_cancel",
-                                Hyprlang::CConfigValue((Hyprlang::INT)0));
+                                Hyprlang::CConfigValue((Hyprlang::INT)1));
 #pragma GCC diagnostic pop
 
     HyprlandAPI::addConfigKeyword(PHANDLE, "hyprgrass-bind", onNewBind, Hyprlang::SHandlerOptions{});

src/main.cpp

@@ -3,6 +3,7 @@ subdir('gestures')
 shared_module('hyprgrass',
   'main.cpp',
   'GestureManager.cpp',
+  'VecSet.cpp',
   cpp_args: ['-DWLR_USE_UNSTABLE'],
   link_with: [gestures],
   dependencies: [