✨ Trackpad gestures

Loop.xcodeproj/project.pbxproj

@@ -7,13 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2A28492B2F22B4B700F6CE42 /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28492A2F22B4B700F6CE42 /* Scribe */; };
 		2A28B6292EE5050C00A1E26B /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28B6282EE5050C00A1E26B /* Defaults */; };
 		2A28B62C2EE5057C00A1E26B /* Luminare in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28B62B2EE5057C00A1E26B /* Luminare */; };
+		2A847DFC2F5E49E90099E02A /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2A847DFB2F5E49E90099E02A /* Scribe */; };
+		2A847DFF2F5E4A080099E02A /* Subsurface in Frameworks */ = {isa = PBXBuildFile; productRef = 2A847DFE2F5E4A080099E02A /* Subsurface */; };
+		2A847E012F5E4A0E0099E02A /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2A847E002F5E4A0E0099E02A /* Scribe */; };
 		2A86890D2F80968A005B521B /* LoopDockTile.plugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2A8689072F809625005B521B /* LoopDockTile.plugin */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		2AE091C72F81A22800EF6149 /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2AE091C62F81A22800EF6149 /* Scribe */; };
-		2AF9238E2F540B1300F467FD /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2AF9238D2F540B1300F467FD /* Scribe */; };
-		2AF923902F540B2200F467FD /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2AF9238F2F540B2200F467FD /* Scribe */; };
 		3ED0A7B92F21DF6800A58629 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 3ED0A7B82F21DF6800A58629 /* ZIPFoundation */; };
 		B1AA00412F30000100AABBCC /* LoopUpdaterHelper in CopyFiles */ = {isa = PBXBuildFile; fileRef = B1AA00012F30000100AABBCC /* LoopUpdaterHelper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		F06D768A2DFF7A77007EEDA9 /* SkyLight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F06D76892DFF7A77007EEDA9 /* SkyLight.framework */; };
@@ -128,10 +128,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2A847DFC2F5E49E90099E02A /* Scribe in Frameworks */,
+				2A847DFF2F5E4A080099E02A /* Subsurface in Frameworks */,
 				2A28B6292EE5050C00A1E26B /* Defaults in Frameworks */,
 				2A28B62C2EE5057C00A1E26B /* Luminare in Frameworks */,
-				2AF9238E2F540B1300F467FD /* Scribe in Frameworks */,
-				2A28492B2F22B4B700F6CE42 /* Scribe in Frameworks */,
 				F06D768A2DFF7A77007EEDA9 /* SkyLight.framework in Frameworks */,
 				3ED0A7B92F21DF6800A58629 /* ZIPFoundation in Frameworks */,
 			);
@@ -141,7 +141,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2AF923902F540B2200F467FD /* Scribe in Frameworks */,
+				2A847E012F5E4A0E0099E02A /* Scribe in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -235,8 +235,8 @@
 				2A28B6282EE5050C00A1E26B /* Defaults */,
 				2A28B62B2EE5057C00A1E26B /* Luminare */,
 				3ED0A7B82F21DF6800A58629 /* ZIPFoundation */,
-				2A28492A2F22B4B700F6CE42 /* Scribe */,
-				2AF9238D2F540B1300F467FD /* Scribe */,
+				2A847DFB2F5E49E90099E02A /* Scribe */,
+				2A847DFE2F5E4A080099E02A /* Subsurface */,
 			);
 			productName = WindowManager;
 			productReference = A8E59C35297F5E9A0064D4BA /* Loop.app */;
@@ -259,7 +259,7 @@
 			);
 			name = LoopUpdaterHelper;
 			packageProductDependencies = (
-				2AF9238F2F540B2200F467FD /* Scribe */,
+				2A847E002F5E4A0E0099E02A /* Scribe */,
 			);
 			productName = LoopUpdaterHelper;
 			productReference = B1AA00012F30000100AABBCC /* LoopUpdaterHelper */;
@@ -311,7 +311,8 @@
 				2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */,
 				2A28B62A2EE5057C00A1E26B /* XCRemoteSwiftPackageReference "luminare" */,
 				3ED0A7B72F21DF6800A58629 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
-				2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */,
+				2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */,
+				2A847DFD2F5E4A080099E02A /* XCRemoteSwiftPackageReference "Subsurface" */,
 			);
 			productRefGroup = A8E59C36297F5E9A0064D4BA /* Products */;
 			projectDirPath = "";
@@ -926,14 +927,22 @@
 				kind = branch;
 			};
 		};
-		2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */ = {
+		2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SenpaiHunters/Scribe";
 			requirement = {
 				branch = main;
 				kind = branch;
 			};
 		};
+		2A847DFD2F5E4A080099E02A /* XCRemoteSwiftPackageReference "Subsurface" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/MrKai77/Subsurface";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
 		3ED0A7B72F21DF6800A58629 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/weichsel/ZIPFoundation";
@@ -945,10 +954,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		2A28492A2F22B4B700F6CE42 /* Scribe */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Scribe;
-		};
 		2A28B6282EE5050C00A1E26B /* Defaults */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */;
@@ -959,19 +964,24 @@
 			package = 2A28B62A2EE5057C00A1E26B /* XCRemoteSwiftPackageReference "luminare" */;
 			productName = Luminare;
 		};
-		2AE091C62F81A22800EF6149 /* Scribe */ = {
+		2A847DFB2F5E49E90099E02A /* Scribe */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */;
+			package = 2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */;
 			productName = Scribe;
 		};
-		2AF9238D2F540B1300F467FD /* Scribe */ = {
+		2AE091C62F81A22800EF6149 /* Scribe */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */;
+			package = 2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */;
 			productName = Scribe;
 		};
-		2AF9238F2F540B2200F467FD /* Scribe */ = {
+		2A847DFE2F5E4A080099E02A /* Subsurface */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 2A847DFD2F5E4A080099E02A /* XCRemoteSwiftPackageReference "Subsurface" */;
+			productName = Subsurface;
+		};
+		2A847E002F5E4A0E0099E02A /* Scribe */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */;
+			package = 2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */;
 			productName = Scribe;
 		};
 		3ED0A7B82F21DF6800A58629 /* ZIPFoundation */ = {

Loop/Core/LoopManager.swift

@@ -25,6 +25,7 @@ final class LoopManager {
     private let updater = Updater.shared
 
     private var accessibilityCheckerTask: Task<(), Never>?
+    private var gestureToggleTask: Task<(), Never>?
 
     /// Opening prepares resizeContext asynchronously. We track that setup separately
     /// so rapid trigger events cannot act on the previous/default context.
@@ -59,7 +60,7 @@ final class LoopManager {
         windowActionCache: windowActionCache,
         openCallback: { [weak self] action in
             Task {
-                await self?.openLoop(startingAction: action)
+                try? await self?.openLoop(startingAction: action)
             }
         },
         closeCallback: { [weak self] forceClose in
@@ -75,7 +76,7 @@ final class LoopManager {
     private(set) lazy var middleClickTrigger = MiddleClickTrigger(
         openCallback: { [weak self] action in
             Task {
-                await self?.openLoop(startingAction: action)
+                try? await self?.openLoop(startingAction: action)
             }
         },
         closeCallback: { [weak self] forceClose in
@@ -86,6 +87,27 @@ final class LoopManager {
         checkIfLoopOpen: { [weak self] in self?.isLoopActiveAtomic ?? false }
     )
 
+    private(set) lazy var multitouchTrigger = MultitouchTrigger(
+        windowActionCache: windowActionCache,
+        openCallback: { [weak self] action, window in
+            guard let self else { return }
+            try await openLoop(startingAction: action, window: window)
+        },
+        closeCallback: { [weak self] forceClose in
+            Task {
+                await self?.closeLoop(forceClose: forceClose)
+            }
+        },
+        changeAction: { [weak self] action, reverse in
+            Task {
+                await self?.changeAction(action, reverse: reverse)
+            }
+        },
+        checkIfLoopOpen: { [weak self] in
+            self?.isLoopActive ?? false
+        }
+    )
+
     private(set) lazy var mouseInteractionObserver = MouseInteractionObserver(
         windowActionCache: windowActionCache,
         changeAction: { [weak self] newAction in
@@ -109,6 +131,8 @@ final class LoopManager {
     )
 
     func start() {
+        multitouchTrigger.prepare()
+
         accessibilityCheckerTask = Task(priority: .background) { [weak self] in
             for await status in AccessibilityManager.shared.stream(initial: true) {
                 guard let self, !Task.isCancelled else {
@@ -118,9 +142,25 @@ final class LoopManager {
                 if status {
                     await keybindTrigger.start()
                     middleClickTrigger.start()
+                    if Defaults[.enableGestures] {
+                        multitouchTrigger.start()
+                    }
                 } else {
                     keybindTrigger.stop()
                     middleClickTrigger.stop()
+                    multitouchTrigger.stop()
+                }
+            }
+        }
+
+        gestureToggleTask = Task(priority: .background) { [weak self] in
+            for await enabled in Defaults.updates(.enableGestures) {
+                guard let self, !Task.isCancelled else { break }
+
+                if enabled, AccessibilityManager.shared.isGranted {
+                    multitouchTrigger.start()
+                } else {
+                    multitouchTrigger.stop()
                 }
             }
         }
@@ -129,12 +169,15 @@ final class LoopManager {
     func shutdown() {
         accessibilityCheckerTask?.cancel()
         accessibilityCheckerTask = nil
+        gestureToggleTask?.cancel()
+        gestureToggleTask = nil
 
         indicatorService.closeAll()
 
         keybindTrigger.stop()
         middleClickTrigger.stop()
         mouseInteractionObserver.stop()
+        multitouchTrigger.shutdown()
         triggerKeyTimeoutTimer.cancel()
 
         isLoopOpening = false
@@ -145,12 +188,29 @@ final class LoopManager {
     }
 }
 
+enum LoopManagerError: LocalizedError {
+    case accessibilityNotGranted
+    case appExcluded
+    case fullscreenWindow
+
+    var errorDescription: String? {
+        switch self {
+        case .accessibilityNotGranted:
+            "Cannot open Loop: accessibility permission not granted"
+        case .appExcluded:
+            "Cannot open Loop: app is excluded"
+        case .fullscreenWindow:
+            "Cannot open Loop: target window is fullscreen"
+        }
+    }
+}
+
 // MARK: - Opening/Closing Loop
 
 extension LoopManager {
-    private func openLoop(startingAction: WindowAction) async {
+    private func openLoop(startingAction: WindowAction, window: Window? = nil) async throws {
         guard AccessibilityManager.shared.isGranted else {
-            return
+            throw LoopManagerError.accessibilityNotGranted
         }
 
         guard !isLoopOpening else {
@@ -172,13 +232,14 @@ extension LoopManager {
             return
         }
 
-        let window = WindowUtility.userDefinedTargetWindow()
+        let window = window ?? WindowUtility.userDefinedTargetWindow()
 
-        guard
-            window?.isAppExcluded != true,
-            (window?.fullscreen ?? false && Defaults[.ignoreFullscreen]) == false
-        else {
-            return
+        guard window?.isAppExcluded != true else {
+            throw LoopManagerError.appExcluded
+        }
+
+        guard (window?.fullscreen ?? false && Defaults[.ignoreFullscreen]) == false else {
+            throw LoopManagerError.fullscreenWindow
         }
 
         isLoopOpening = true
@@ -283,7 +344,8 @@ extension LoopManager {
         _ newAction: WindowAction,
         triggeredFromScreenChange: Bool = false,
         disableHapticFeedback: Bool = false,
-        canAdvanceCycle: Bool = true
+        canAdvanceCycle: Bool = true,
+        reverse: Bool = false
     ) async {
         guard
             isLoopActive,
@@ -315,7 +377,7 @@ extension LoopManager {
             // The ability to advance a cycle is only available when the action is triggered via a keybind or a left click on the mouse.
             // This should be set to false when the mouse is moved to prevent rapid cycling.
             if canAdvanceCycle {
-                newAction = await getNextCycleAction(newAction)
+                newAction = await getNextCycleAction(newAction, reverse: reverse)
             } else {
                 if let cycle = newAction.cycle, !cycle.contains(resizeContext.action) {
                     newAction = cycle.first ?? .init(.noAction)
@@ -473,8 +535,8 @@ extension LoopManager {
         }
     }
 
-    private func getNextCycleAction(_ action: WindowAction) async -> WindowAction {
-        guard let currentCycle = action.cycle else {
+    private func getNextCycleAction(_ action: WindowAction, reverse: Bool) async -> WindowAction {
+        guard let currentCycle = action.cycle, !currentCycle.isEmpty else {
             return action
         }
 
@@ -486,12 +548,13 @@ extension LoopManager {
             && Defaults[.triggerKey].contains(.kVK_Shift) == false
             && Defaults[.cycleBackwardsOnShiftPressed]
 
-        let shouldCycleBackwards = allowReverseCycle && keybindTrigger.effectiveEventFlags.contains(.maskShift)
+        let shouldCycleBackwards = reverse || (allowReverseCycle && keybindTrigger.effectiveEventFlags.contains(.maskShift))
+        let freshStart = shouldCycleBackwards ? (currentCycle.last ?? currentCycle[0]) : currentCycle[0]
         var currentIndex: Int? = nil
 
         if Defaults[.cycleModeRestartEnabled],
            resizeContext.action.direction == .noSelection || !currentCycle.contains(resizeContext.action) {
-            return currentCycle[0]
+            return freshStart
         }
 
         // If the current action is noSelection, we can preserve the index from the last action.
@@ -506,7 +569,7 @@ extension LoopManager {
         }
 
         guard var nextIndex = currentIndex else {
-            return currentCycle[0]
+            return freshStart
         }
 
         nextIndex += shouldCycleBackwards ? -1 : 1

Loop/Core/Observers/Helpers/MultitouchGestureBlocker.swift

@@ -0,0 +1,47 @@
+//
+//  MultitouchGestureBlocker.swift
+//  Loop
+//
+//  Created by Kai Azim on 2026-04-05.
+//
+
+import AppKit
+import Scribe
+
+/// Reference-counted because the blocker is shared across in-flight
+/// gestures: one gesture ending mustn't disable blocking for others still
+/// active. `start()` is also idempotent so duplicate calls don't leak the
+/// previous `ActiveEventMonitor` (it self-retains via `Unmanaged.passRetained`).
+@Loggable
+final class MultitouchGestureBlocker {
+    private var monitor: ActiveEventMonitor?
+    private var activeCount: Int = 0
+
+    func start() {
+        activeCount += 1
+        guard monitor == nil else { return }
+
+        log.info("Starting gesture blocker")
+
+        let eventTypes: [CGEventType] = [
+            .scrollWheel,
+            CGEventType(rawValue: UInt32(NSEvent.EventType.gesture.rawValue)),
+            CGEventType(rawValue: UInt32(NSEvent.EventType.magnify.rawValue)),
+            CGEventType(rawValue: UInt32(NSEvent.EventType.rotate.rawValue)),
+            CGEventType(rawValue: UInt32(NSEvent.EventType.smartMagnify.rawValue))
+        ].compactMap(\.self)
+
+        monitor = ActiveEventMonitor("gesture_blocker", events: eventTypes) { _ in .ignore }
+        monitor?.start()
+    }
+
+    func stop() {
+        activeCount = max(0, activeCount - 1)
+        guard activeCount == 0 else { return }
+
+        monitor?.stop()
+        monitor = nil
+
+        log.info("Stopped gesture blocker")
+    }
+}