Skip to content

Commit

Permalink
✨ #74 half-working functionality!
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrKai77
MrKai77 committed Dec 19, 2023
1 parent 97eddb0 commit 1845fdb
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 56 deletions.
2 changes: 2 additions & 0 deletions Loop/Extensions/Defaults+Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ extension Defaults.Keys {
static let animateWindowResizes = Key<Bool>("animateWindowResizes", default: false) // BETA
static let windowPadding = Key<CGFloat>("windowPadding", default: 0)

static let onlyShowWhenDirectionSelected = Key<Bool>("onlyShowWhenDirectionSelected", default: false)

static let animationConfiguration = Key<AnimationConfiguration>("animationConfiguration", default: .smooth)

static let useSystemAccentColor = Key<Bool>("useSystemAccentColor", default: true)
Expand Down
157 changes: 107 additions & 50 deletions Loop/Managers/LoopManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ class LoopManager: ObservableObject {
private let previewController = PreviewController()

private var currentlyPressedModifiers: Set<CGKeyCode> = []
private var isLoopShown: Bool = false
private var isLoopActive: Bool = false
private var areWindowsOpen: Bool = false
private var frontmostWindow: Window?
private var screenWithMouse: NSScreen?

Expand All @@ -34,29 +35,50 @@ class LoopManager: ObservableObject {
private var distanceToMouse: CGFloat = 0

func startObservingKeys() {
self.flagsChangedEventMonitor = NSEventMonitor(scope: .global, eventMask: .flagsChanged, handler: handleLoopKeypress(_:))
self.flagsChangedEventMonitor!.start()

self.mouseMovedEventMonitor = NSEventMonitor(scope: .global, eventMask: .mouseMoved, handler: mouseMoved(_:))

self.middleClickMonitor = CGEventMonitor(eventMask: [.otherMouseDragged, .otherMouseUp], callback: handleMiddleClick(cgEvent:))
self.middleClickMonitor!.start()

self.keyDownEventMonitor = NSEventMonitor(scope: .global, eventMask: .keyDown) { _ in
self.flagsChangedEventMonitor = NSEventMonitor(
scope: .global,
eventMask: .flagsChanged,
handler: handleLoopKeypress(_:)
)

self.mouseMovedEventMonitor = NSEventMonitor(
scope: .global,
eventMask: .mouseMoved,
handler: mouseMoved(_:)
)

self.middleClickMonitor = CGEventMonitor(
eventMask: [.otherMouseDragged, .otherMouseUp],
callback: handleMiddleClick(cgEvent:)
)

self.keyDownEventMonitor = NSEventMonitor(
scope: .global,
eventMask: .keyDown
) { _ in
if Defaults[.doubleClickToTrigger] &&
abs(self.lastTriggerKeyClick.timeIntervalSinceNow) < NSEvent.doubleClickInterval {
self.lastTriggerKeyClick = Date.distantPast
}
}
self.keyDownEventMonitor!.start()

Notification.Name.forceCloseLoop.onRecieve { _ in
self.closeLoop(forceClose: true)
}

Notification.Name.directionChanged.onRecieve { notification in
if let direction = notification.userInfo?["direction"] as? WindowDirection {
self.changeDirection(direction)
}
}

self.flagsChangedEventMonitor!.start()
self.middleClickMonitor!.start()
self.keyDownEventMonitor!.start()
}

private func mouseMoved(_ event: NSEvent) {
let noActionDistance: CGFloat = 8
let noActionDistance: CGFloat = 10

let currentMouseLocation = NSEvent.mouseLocation
let mouseAngle = Angle(radians: initialMousePosition.angle(to: currentMouseLocation))
Expand All @@ -71,33 +93,50 @@ class LoopManager: ObservableObject {
self.angleToMouse = mouseAngle
self.distanceToMouse = mouseDistance

let previousResizeDirection = currentResizeDirection
var resizeDirection: WindowDirection = .noAction

// If mouse over 50 points away, select half or quarter positions
if distanceToMouse > pow(50 - Defaults[.radialMenuThickness], 2) {
switch Int((angleToMouse.normalized().degrees + 22.5) / 45) {
case 0, 8: currentResizeDirection = .cycleRight
case 1: currentResizeDirection = .bottomRightQuarter
case 2: currentResizeDirection = .cycleBottom
case 3: currentResizeDirection = .bottomLeftQuarter
case 4: currentResizeDirection = .cycleLeft
case 5: currentResizeDirection = .topLeftQuarter
case 6: currentResizeDirection = .cycleTop
case 7: currentResizeDirection = .topRightQuarter
default: currentResizeDirection = .noAction
case 0, 8: resizeDirection = .cycleRight
case 1: resizeDirection = .bottomRightQuarter
case 2: resizeDirection = .cycleBottom
case 3: resizeDirection = .bottomLeftQuarter
case 4: resizeDirection = .cycleLeft
case 5: resizeDirection = .topLeftQuarter
case 6: resizeDirection = .cycleTop
case 7: resizeDirection = .topRightQuarter
default: resizeDirection = .noAction
}
} else if distanceToMouse < pow(noActionDistance, 2) {
currentResizeDirection = .noAction
resizeDirection = .noAction
} else {
currentResizeDirection = .maximize
resizeDirection = .maximize
}

if currentResizeDirection.cyclable {
self.currentResizeDirection = currentResizeDirection.nextCyclingDirection(from: self.currentResizeDirection)
if resizeDirection != self.currentResizeDirection.base {
changeDirection(resizeDirection)
}
}

private func changeDirection(_ direction: WindowDirection) {
guard self.currentResizeDirection != direction else { return }

var newDirection = direction
if newDirection.cyclable {
newDirection = direction.nextCyclingDirection(from: self.currentResizeDirection)
}

if newDirection != currentResizeDirection {
self.currentResizeDirection = newDirection

if Defaults[.onlyShowWhenDirectionSelected] {
self.openWindows()
}

if currentResizeDirection != previousResizeDirection {
Notification.Name.directionChanged.post(userInfo: ["direction": currentResizeDirection])
DispatchQueue.main.async {
Notification.Name.directionChanged.post(userInfo: ["direction": self.currentResizeDirection])
}

NSHapticFeedbackManager.defaultPerformer.perform(
NSHapticFeedbackManager.FeedbackPattern.alignment,
Expand All @@ -108,11 +147,11 @@ class LoopManager: ObservableObject {

func handleMiddleClick(cgEvent: CGEvent) -> Unmanaged<CGEvent>? {
if let event = NSEvent(cgEvent: cgEvent), event.buttonNumber == 2, Defaults[.middleClickTriggersLoop] {
if event.type == .otherMouseDragged && !self.isLoopShown {
if event.type == .otherMouseDragged && !self.isLoopActive {
self.openLoop()
}

if event.type == .otherMouseUp && self.isLoopShown {
if event.type == .otherMouseUp && self.isLoopActive {
self.closeLoop()
}
}
Expand All @@ -137,7 +176,6 @@ class LoopManager: ObservableObject {
private func handleLoopKeypress(_ event: NSEvent) {
if event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.capsLock) {
self.closeLoop(forceClose: true)
return
}

if self.currentlyPressedModifiers.contains(event.keyCode) {
Expand Down Expand Up @@ -175,39 +213,38 @@ class LoopManager: ObservableObject {
}
self.lastTriggerKeyClick = Date.now
} else {
if self.isLoopShown {
if self.isLoopActive {
self.closeLoop()
}
}
}

private func openLoop() {
guard self.isLoopShown == false else { return }
guard self.isLoopActive == false else { return }

self.currentResizeDirection = .noAction
self.frontmostWindow = nil

// Loop will only open if accessibility access has been granted
if PermissionsManager.Accessibility.getStatus() {
self.frontmostWindow = WindowEngine.frontmostWindow
self.initialMousePosition = NSEvent.mouseLocation
self.screenWithMouse = NSScreen.screenWithMouse
self.mouseMovedEventMonitor!.start()
// Ensure accessibility access
guard PermissionsManager.Accessibility.getStatus() else { return }

if Defaults[.previewVisibility] == true && self.frontmostWindow != nil {
self.previewController.open(screen: self.screenWithMouse!, window: frontmostWindow)
}
self.radialMenuController.open(frontmostWindow: frontmostWindow)
self.keybindMonitor.start()
self.frontmostWindow = WindowEngine.frontmostWindow
self.initialMousePosition = NSEvent.mouseLocation
self.screenWithMouse = NSScreen.screenWithMouse
self.mouseMovedEventMonitor!.start()

isLoopShown = true
if !Defaults[.onlyShowWhenDirectionSelected] {
self.openWindows()
}

self.keybindMonitor.start()

isLoopActive = true
}

private func closeLoop(forceClose: Bool = false) {
self.cancelTriggerDelayTimer()
self.radialMenuController.close()
self.previewController.close()
self.closeWindows()

self.keybindMonitor.resetPressedKeys()
self.keybindMonitor.stop()
Expand All @@ -217,7 +254,7 @@ class LoopManager: ObservableObject {
self.screenWithMouse != nil &&
forceClose == false &&
self.currentResizeDirection != .noAction &&
self.isLoopShown {
self.isLoopActive {

WindowEngine.resize(self.frontmostWindow!, to: self.currentResizeDirection, self.screenWithMouse!)

Expand All @@ -228,11 +265,31 @@ class LoopManager: ObservableObject {
Defaults[.timesLooped] += 1
IconManager.checkIfUnlockedNewIcon()
} else {
if self.frontmostWindow == nil && isLoopShown {
if self.frontmostWindow == nil && isLoopActive {
NSSound.beep()
}
}

isLoopShown = false
isLoopActive = false
}

private func openWindows() {
guard self.areWindowsOpen == false else { return }

if Defaults[.previewVisibility] == true && self.frontmostWindow != nil {
self.previewController.open(screen: self.screenWithMouse!, window: frontmostWindow)
}
self.radialMenuController.open(position: self.initialMousePosition, frontmostWindow: frontmostWindow)

self.areWindowsOpen = true
}

private func closeWindows() {
guard self.areWindowsOpen == true else { return }

self.radialMenuController.close()
self.previewController.close()

self.areWindowsOpen = false
}
}
6 changes: 3 additions & 3 deletions Loop/Radial Menu/RadialMenuController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ class RadialMenuController {

private var loopRadialMenuWindowController: NSWindowController?

func open(frontmostWindow: Window?) {
func open(position: CGPoint, frontmostWindow: Window?) {
if let windowController = loopRadialMenuWindowController {
windowController.window?.orderFrontRegardless()
return
}

let mouseX: CGFloat = NSEvent.mouseLocation.x
let mouseY: CGFloat = NSEvent.mouseLocation.y
let mouseX: CGFloat = position.x
let mouseY: CGFloat = position.y

let windowSize: CGFloat = 250

Expand Down
2 changes: 1 addition & 1 deletion Loop/Radial Menu/RadialMenuView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ struct RadialMenuView: View {
}
.onReceive(.directionChanged) { obj in
if let direction = obj.userInfo?["direction"] as? WindowDirection {
self.currentResizeDirection = direction.parent
self.currentResizeDirection = direction.base
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Loop/Settings/RadialMenuSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct RadialMenuSettingsView: View {
Form {
Section("Appearance") {
RadialMenuView(
frontmostWindow: nil,
frontmostWindow: nil,
previewMode: true,
timer: Timer.publish(every: 1,
on: .main,
Expand Down
2 changes: 1 addition & 1 deletion Loop/Window Management/WindowDirection.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ enum WindowDirection: Int, CaseIterable, Identifiable, Codable {
}

// Gets the cyclable direction
var parent: WindowDirection {
var base: WindowDirection {
switch self {
case .topHalf, .topThird, .topTwoThirds: .cycleTop
case .bottomHalf, .bottomThird, .bottomTwoThirds: .cycleBottom
Expand Down

0 comments on commit 1845fdb

Please sign in to comment.