fix: hotkey conflict

amorphobia · amorphobia · commit 138442ab8e11 · 2023-11-29T09:32:55.000+08:00
diff --git a/Rabbit.ahk b/Rabbit.ahk
@@ -295,10 +295,11 @@ ProcessKey(key, mask, this_hotkey) {
     }
 
     if not processed {
-        if RegExMatch(SubStr(this_hotkey, 2), "([\<\>\^\+]+)(.+)", &matched)
-            SendInput(StrReplace(StrReplace(matched[1], "<"), ">") . "{" . matched[2] . "}")
-        else
-            SendInput("{" . key . "}")
+        local shift := (mask & KeyDef.mask["Shift"]) ? "+" : ""
+        local ctrl := (mask & KeyDef.mask["Ctrl"]) ? "^" : ""
+        local alt := (mask & KeyDef.mask["Alt"]) ? "!" : ""
+        local win := (mask & KeyDef.mask["Win"]) ? "#" : ""
+        SendInput(shift . ctrl . alt . win . "{" . key . "}")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -295,10 +295,11 @@ ProcessKey(key, mask, this_hotkey) {`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`if not processed {`
`298`		`- if RegExMatch(SubStr(this_hotkey, 2), "([\<\>\^\+]+)(.+)", &matched)`
`299`		`- SendInput(StrReplace(StrReplace(matched[1], "<"), ">") . "{" . matched[2] . "}")`
`300`		`- else`
`301`		`- SendInput("{" . key . "}")`
	`298`	`+ local shift := (mask & KeyDef.mask["Shift"]) ? "+" : ""`
	`299`	`+ local ctrl := (mask & KeyDef.mask["Ctrl"]) ? "^" : ""`
	`300`	`+ local alt := (mask & KeyDef.mask["Alt"]) ? "!" : ""`
	`301`	`+ local win := (mask & KeyDef.mask["Win"]) ? "#" : ""`
	`302`	`+ SendInput(shift . ctrl . alt . win . "{" . key . "}")`
`302`	`303`	`}`
`303`	`304`	`}`
`304`	`305`