From d6b3950f55251bb0affacc8f61193932c636aa75 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Thu, 22 May 2025 22:53:18 -0700 Subject: [PATCH] Fixed: fix #32 temporary code --- hook.go | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/hook.go b/hook.go index e3b4698..b092f67 100644 --- a/hook.go +++ b/hook.go @@ -38,13 +38,14 @@ const ( HookEnabled = 1 // iota HookDisabled = 2 - KeyDown = 3 - KeyHold = 4 - KeyUp = 5 + KeyDown = 4 // 3 + KeyHold = 3 // 4 + KeyUp = 5 // 5 + + MouseDown = 7 // 6 + MouseHold = 8 // 7 + MouseUp = 6 // 8 - MouseUp = 6 - MouseHold = 7 - MouseDown = 8 MouseMove = 9 MouseDrag = 10 MouseWheel = 11 @@ -177,40 +178,32 @@ func (e Event) String() string { return fmt.Sprintf("%v - Event: {Kind: HookEnabled}", e.When) case HookDisabled: return fmt.Sprintf("%v - Event: {Kind: HookDisabled}", e.When) + case KeyDown: + return fmt.Sprintf("%v - Event: {Kind: KeyDown, Rawcode: %v, Keychar: %v}", + e.When, e.Rawcode, e.Keychar) + case KeyHold: + return fmt.Sprintf("%v - Event: {Kind: KeyHold, Rawcode: %v, Keychar: %v}", + e.When, e.Rawcode, e.Keychar) case KeyUp: return fmt.Sprintf("%v - Event: {Kind: KeyUp, Rawcode: %v, Keychar: %v}", e.When, e.Rawcode, e.Keychar) - case KeyHold: - return fmt.Sprintf( - "%v - Event: {Kind: KeyHold, Rawcode: %v, Keychar: %v}", - e.When, e.Rawcode, e.Keychar) - case KeyDown: - return fmt.Sprintf( - "%v - Event: {Kind: KeyDown, Rawcode: %v, Keychar: %v}", - e.When, e.Rawcode, e.Keychar) - case MouseUp: - return fmt.Sprintf( - "%v - Event: {Kind: MouseUp, Button: %v, X: %v, Y: %v, Clicks: %v}", + case MouseDown: + return fmt.Sprintf("%v - Event: {Kind: MouseDown, Button: %v, X: %v, Y: %v, Clicks: %v}", e.When, e.Button, e.X, e.Y, e.Clicks) case MouseHold: - return fmt.Sprintf( - "%v - Event: {Kind: MouseHold, Button: %v, X: %v, Y: %v, Clicks: %v}", + return fmt.Sprintf("%v - Event: {Kind: MouseHold, Button: %v, X: %v, Y: %v, Clicks: %v}", e.When, e.Button, e.X, e.Y, e.Clicks) - case MouseDown: - return fmt.Sprintf( - "%v - Event: {Kind: MouseDown, Button: %v, X: %v, Y: %v, Clicks: %v}", + case MouseUp: + return fmt.Sprintf("%v - Event: {Kind: MouseUp, Button: %v, X: %v, Y: %v, Clicks: %v}", e.When, e.Button, e.X, e.Y, e.Clicks) case MouseMove: - return fmt.Sprintf( - "%v - Event: {Kind: MouseMove, Button: %v, X: %v, Y: %v, Clicks: %v}", + return fmt.Sprintf("%v - Event: {Kind: MouseMove, Button: %v, X: %v, Y: %v, Clicks: %v}", e.When, e.Button, e.X, e.Y, e.Clicks) case MouseDrag: - return fmt.Sprintf( - "%v - Event: {Kind: MouseDrag, Button: %v, X: %v, Y: %v, Clicks: %v}", + return fmt.Sprintf("%v - Event: {Kind: MouseDrag, Button: %v, X: %v, Y: %v, Clicks: %v}", e.When, e.Button, e.X, e.Y, e.Clicks) case MouseWheel: - return fmt.Sprintf( - "%v - Event: {Kind: MouseWheel, Amount: %v, Rotation: %v, Direction: %v}", + return fmt.Sprintf("%v - Event: {Kind: MouseWheel, Amount: %v, Rotation: %v, Direction: %v}", e.When, e.Amount, e.Rotation, e.Direction) case FakeEvent: return fmt.Sprintf("%v - Event: {Kind: FakeEvent}", e.When)