kind of working finally

2026-08-08 18:14:08 +00:00 · 2026-04-09 22:57:06 -07:00
parent ba0e75c503
commit 25ab3accfa
78 changed files with 6700 additions and 5000 deletions
@@ -1,112 +1,98 @@
-// Package hotkey provides global keyboard shortcut detection and handling.
 package hotkey

-import "strings"
+import (
+	"strings"

-// Windows Virtual Key Codes
-// See: https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
-const (
-	VK_LCTRL  = 162 // Left Control
-	VK_RCTRL  = 163 // Right Control
-	VK_LSHIFT = 160 // Left Shift
-	VK_RSHIFT = 161 // Right Shift
-	VK_LALT   = 164 // Left Alt (Menu)
-	VK_RALT   = 165 // Right Alt (Menu)
-	VK_LWIN   = 91  // Left Windows key
-	VK_RWIN   = 92  // Right Windows key
+	"wis-free-v3/internal/xhotkey"
 )

-// keyMap maps human-readable key names to Windows Virtual Key Codes.
-// Each key may have multiple valid codes (e.g., left and right variants).
-var keyMap = map[string][]uint16{
-	// Modifier keys
-	"ctrl":    {VK_LCTRL, VK_RCTRL, 17},
-	"control": {VK_LCTRL, VK_RCTRL, 17},
-	"shift":   {VK_LSHIFT, VK_RSHIFT, 16},
-	"alt":     {VK_LALT, VK_RALT, 18},
-	"win":     {VK_LWIN, VK_RWIN, 91, 92},
-	"windows": {VK_LWIN, VK_RWIN, 91, 92},
-	"meta":    {VK_LWIN, VK_RWIN, 91, 92},
-	"super":   {VK_LWIN, VK_RWIN, 91, 92},
-
-	// Special keys
-	"backspace": {8},
-	"tab":       {9},
-	"enter":     {13},
-	"escape":    {27},
-	"esc":       {27},
-	"space":     {32},
-	"left":      {37},
-	"up":        {38},
-	"right":     {39},
-	"down":      {40},
-	"delete":    {46},
-	"del":       {46},
-
-	// Number keys (top row)
-	"0": {48}, "1": {49}, "2": {50}, "3": {51}, "4": {52},
-	"5": {53}, "6": {54}, "7": {55}, "8": {56}, "9": {57},
-
-	// Letter keys
-	"a": {65}, "b": {66}, "c": {67}, "d": {68}, "e": {69},
-	"f": {70}, "g": {71}, "h": {72}, "i": {73}, "j": {74},
-	"k": {75}, "l": {76}, "m": {77}, "n": {78}, "o": {79},
-	"p": {80}, "q": {81}, "r": {82}, "s": {83}, "t": {84},
-	"u": {85}, "v": {86}, "w": {87}, "x": {88}, "y": {89},
-	"z": {90},
-
-	// Function keys
-	"f1": {112}, "f2": {113}, "f3": {114}, "f4": {115},
-	"f5": {116}, "f6": {117}, "f7": {118}, "f8": {119},
-	"f9": {120}, "f10": {121}, "f11": {122}, "f12": {123},
+// KeyMap maps human-readable key names to golang.design/x/hotkey Key instances.
+var KeyMap = map[string]hotkey.Key{
+	"space":  hotkey.KeySpace,
+	"0":      hotkey.Key0,
+	"1":      hotkey.Key1,
+	"2":      hotkey.Key2,
+	"3":      hotkey.Key3,
+	"4":      hotkey.Key4,
+	"5":      hotkey.Key5,
+	"6":      hotkey.Key6,
+	"7":      hotkey.Key7,
+	"8":      hotkey.Key8,
+	"9":      hotkey.Key9,
+	"a":      hotkey.KeyA,
+	"b":      hotkey.KeyB,
+	"c":      hotkey.KeyC,
+	"d":      hotkey.KeyD,
+	"e":      hotkey.KeyE,
+	"f":      hotkey.KeyF,
+	"g":      hotkey.KeyG,
+	"h":      hotkey.KeyH,
+	"i":      hotkey.KeyI,
+	"j":      hotkey.KeyJ,
+	"k":      hotkey.KeyK,
+	"l":      hotkey.KeyL,
+	"m":      hotkey.KeyM,
+	"n":      hotkey.KeyN,
+	"o":      hotkey.KeyO,
+	"p":      hotkey.KeyP,
+	"q":      hotkey.KeyQ,
+	"r":      hotkey.KeyR,
+	"s":      hotkey.KeyS,
+	"t":      hotkey.KeyT,
+	"u":      hotkey.KeyU,
+	"v":      hotkey.KeyV,
+	"w":      hotkey.KeyW,
+	"x":      hotkey.KeyX,
+	"y":      hotkey.KeyY,
+	"z":      hotkey.KeyZ,
+	"return": hotkey.KeyReturn,
+	"enter":  hotkey.KeyReturn,
+	"escape": hotkey.KeyEscape,
+	"esc":    hotkey.KeyEscape,
+	"delete": hotkey.KeyDelete,
+	"del":    hotkey.KeyDelete,
+	"tab":    hotkey.KeyTab,
+	"left":   hotkey.KeyLeft,
+	"right":  hotkey.KeyRight,
+	"up":     hotkey.KeyUp,
+	"down":   hotkey.KeyDown,
+	"f1":     hotkey.KeyF1,
+	"f2":     hotkey.KeyF2,
+	"f3":     hotkey.KeyF3,
+	"f4":     hotkey.KeyF4,
+	"f5":     hotkey.KeyF5,
+	"f6":     hotkey.KeyF6,
+	"f7":     hotkey.KeyF7,
+	"f8":     hotkey.KeyF8,
+	"f9":     hotkey.KeyF9,
+	"f10":    hotkey.KeyF10,
+	"f11":    hotkey.KeyF11,
+	"f12":    hotkey.KeyF12,
 }

-// modifierKeys identifies which key names are modifiers.
-var modifierKeys = map[string]bool{
-	"ctrl": true, "control": true,
-	"shift": true,
-	"alt":   true,
-	"win":   true, "windows": true, "meta": true, "super": true,
-}
-
-// ParseShortcut parses a shortcut string into a trigger key and modifier keys.
-// The shortcut format is "modifier+modifier+key" (e.g., "ctrl+shift+k").
-//
-// Returns:
-//   - trigger: the primary key code that activates the shortcut
-//   - modifiers: slice of modifier key code variants that must be held
-func ParseShortcut(shortcut string) (trigger []uint16, modifiers [][]uint16) {
+// ParseShortcut parses a shortcut string and returns the hotkey.Key and a list of modifiers.
+// Returns false if parsing fails.
+func ParseShortcut(shortcut string) (hotkey.Key, []hotkey.Modifier, bool) {
 	parts := strings.Split(strings.ToLower(strings.TrimSpace(shortcut)), "+")
 	if len(parts) == 0 {
-		return nil, nil
+		return 0, nil, false
 	}

-	// Last part is always the trigger key
+	// The last part is the trigger key
 	triggerName := strings.TrimSpace(parts[len(parts)-1])
-	if codes, ok := keyMap[triggerName]; ok && len(codes) > 0 {
-		trigger = codes
+	k, exists := KeyMap[triggerName]
+	if !exists {
+		return 0, nil, false
 	}

-	// Preceding parts are modifiers
+	// The preceding parts are modifiers
+	var mods []hotkey.Modifier
 	for i := 0; i < len(parts)-1; i++ {
 		modName := strings.TrimSpace(parts[i])
-		if codes, ok := keyMap[modName]; ok {
-			modifiers = append(modifiers, codes)
+		if m, ok := ModMap[modName]; ok {
+			mods = append(mods, m)
 		}
 	}

-	return trigger, modifiers
+	return k, mods, true
 }
-
-// IsModifier returns true if the given key name is a modifier key.
-func IsModifier(keyName string) bool {
-	return modifierKeys[strings.ToLower(keyName)]
-}
-
-// GetKeyCode returns the virtual key code(s) for a given key name.
-// Returns nil if the key name is not recognized.
-func GetKeyCode(keyName string) []uint16 {
-	return keyMap[strings.ToLower(keyName)]
-}
-
-