Skip to content

Commit

Permalink
Merge pull request #316 from spyoungtech/gh-315
Browse files Browse the repository at this point in the history 
GH-315 fix usage of SetKeyDelay in AHKv2
  • Loading branch information
@spyoungtech
spyoungtech committed May 31, 2024
2 parents f6d1b1e + b9f5b6a commit 6661450
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 10 deletions.
40 changes: 35 additions & 5 deletions ahk/_constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5054,7 +5054,13 @@
}
if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}
Expand All @@ -5080,7 +5086,13 @@
current_key_duration := Format("{}", A_KeyDuration)
if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}
Send("{Raw}" str)
Expand All @@ -5101,7 +5113,13 @@
current_key_duration := Format("{}", A_KeyDuration)
if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}
SendInput(str)
Expand All @@ -5122,7 +5140,13 @@
current_key_duration := Format("{}", A_KeyDuration)
if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}
SendEvent(str)
Expand All @@ -5143,7 +5167,13 @@
current_key_duration := Format("{}", A_KeyDurationPlay)
if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration, "Play")
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}
SendPlay(str)
Expand Down
40 changes: 35 additions & 5 deletions ahk/templates/daemon-v2.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2041,7 +2041,13 @@ AHKSend(args*) {
}

if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}


Expand All @@ -2067,7 +2073,13 @@ AHKSendRaw(args*) {
current_key_duration := Format("{}", A_KeyDuration)

if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}

Send("{Raw}" str)
Expand All @@ -2088,7 +2100,13 @@ AHKSendInput(args*) {
current_key_duration := Format("{}", A_KeyDuration)

if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}

SendInput(str)
Expand All @@ -2109,7 +2127,13 @@ AHKSendEvent(args*) {
current_key_duration := Format("{}", A_KeyDuration)

if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}

SendEvent(str)
Expand All @@ -2130,7 +2154,13 @@ AHKSendPlay(args*) {
current_key_duration := Format("{}", A_KeyDurationPlay)

if (key_delay != "" or key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration, "Play")
if (key_delay != "" and key_press_duration != "") {
SetKeyDelay(key_delay, key_press_duration)
} else if (key_delay != "" and key_press_duration = "") {
SetKeyDelay(key_delay)
} else if (key_delay = "" and key_press_duration != "") {
SetKeyDelay(current_delay, key_press_duration)
}
}

SendPlay(str)
Expand Down

0 comments on commit 6661450

Please sign in to comment.