Ahk: Fix script including and send lib loading (v1);

Chaoses-Ib · Chaoses-Ib · commit 0672abf67f56 · 2021-09-02T22:26:15.000+08:00
Improve documentation
diff --git a/AhkDll.Ahk/v1/IbAhkSend.ahk b/AhkDll.Ahk/v1/IbAhkSend.ahk
@@ -8,7 +8,7 @@ IbSendInit(send_type := "AnyDriver", mode := 1, args*){
     workding_dir := A_WorkingDir
     SetWorkingDir, %A_ScriptDir%
 
-    static hModule := DllCall("LoadLibrary", "Str", "IbAhkSend.dll", "Ptr")
+    static hModule := DllCall("LoadLibrary", "Str", A_ScriptDir "\IbAhkSend.dll", "Ptr")
     if (hModule == 0){
         if (A_PtrSize == 4)
             throw "SendLibLoadFailed: Please use AutoHotkey x64"
diff --git a/AhkDll.Ahk/v1/test/KeyHistory.ahk b/AhkDll.Ahk/v1/test/KeyHistory.ahk
@@ -2,4 +2,6 @@
 #InstallMouseHook
 KeyHistory
 
+; If a key is sent by the driver, it should not have an "i" in the Type field.
+
 F4::ExitApp
diff --git a/AhkDll.Ahk/v1/test/mode 0.ahk b/AhkDll.Ahk/v1/test/mode 0.ahk
@@ -1,6 +1,7 @@
 ; Mode 0 (v1)
 ; Run Notepad, type "Hello world!" and then select all text by mouse.
 
+#Include %A_ScriptDir%
 #Include ..\IbAhkSend.ahk
 
 IbSendInit("AnyDriver", 0)
@@ -10,7 +11,7 @@ WinWaitActive, ahk_class #32770
 IbSend("notepad`n")
 
 WinWaitActive, ahk_exe notepad.exe
-IbSend("Hello world+1")
+IbSend("Hello world{!}")
 Sleep 100
 CoordMode, Mouse, Client
 IbSend("{Click 5, 5, down}{click 150, 50, up}")
diff --git a/AhkDll.Ahk/v1/test/mode 1.ahk b/AhkDll.Ahk/v1/test/mode 1.ahk
@@ -1,6 +1,7 @@
 ; Mode 1 (v1)
 ; Run Notepad, type "Hello world!" and then select all text by mouse.
 
+#Include %A_ScriptDir%
 #Include ..\IbAhkSend.ahk
 
 IbSendInit()
@@ -10,7 +11,7 @@ WinWaitActive, ahk_class #32770
 Send notepad`n
 
 WinWaitActive, ahk_exe notepad.exe
-Send Hello world+1
+Send Hello world{!}
 Sleep 100
 CoordMode, Mouse, Client
 MouseClickDrag, Left, 5, 5, 150, 50
diff --git a/AhkDll.Ahk/v1/test/mode ahk.ahk b/AhkDll.Ahk/v1/test/mode ahk.ahk
@@ -5,7 +5,7 @@ WinWaitActive, ahk_class #32770
 Send notepad`n
 
 WinWaitActive, ahk_exe notepad.exe
-Send Hello world+1
+Send Hello world{!}
 Sleep 100
 CoordMode, Mouse, Client
 MouseClickDrag, Left, 5, 5, 150, 50
diff --git a/AhkDll.Ahk/v1/test/type DD.ahk b/AhkDll.Ahk/v1/test/type DD.ahk
@@ -1,3 +1,4 @@
+#Include %A_ScriptDir%
 #Include ..\IbAhkSend.ahk
 IbSendInit("DD")  ;or IbSendInit("DD", 1, "C:\SomeDir\DD64.dll")
 #include mode ahk.ahk
diff --git a/AhkDll.Ahk/v1/test/type Logitech.ahk b/AhkDll.Ahk/v1/test/type Logitech.ahk
@@ -1,3 +1,4 @@
+#Include %A_ScriptDir%
 #Include ..\IbAhkSend.ahk
 IbSendInit("Logitech")
 #include mode ahk.ahk
diff --git a/AhkDll.Ahk/v1/test/type Razer.ahk b/AhkDll.Ahk/v1/test/type Razer.ahk
@@ -1,3 +1,4 @@
+#Include %A_ScriptDir%
 #Include ..\IbAhkSend.ahk
 IbSendInit("Razer")
 #include mode ahk.ahk
diff --git a/AhkDll.Ahk/v1/test/type SendInput.ahk b/AhkDll.Ahk/v1/test/type SendInput.ahk
@@ -1,3 +1,4 @@
+#Include %A_ScriptDir%
 #Include ..\IbAhkSend.ahk
 IbSendInit("SendInput")
 #include mode ahk.ahk
diff --git a/AhkDll.Ahk/v2/test/KeyHistory.ahk b/AhkDll.Ahk/v2/test/KeyHistory.ahk
@@ -2,4 +2,6 @@
 #InstallMouseHook
 KeyHistory()
 
+; If a key is sent by the driver, it should not have an "i" in the Type field.
+
 F4::ExitApp()
diff --git a/AhkDll.Ahk/v2/test/mode 0.ahk b/AhkDll.Ahk/v2/test/mode 0.ahk
@@ -10,6 +10,6 @@ WinWaitActive("ahk_class #32770")
 IbSend("notepad`n")
 
 WinWaitActive("ahk_exe notepad.exe")
-IbSend("Hello world+1")
+IbSend("Hello world{!}")
 Sleep(100)
 IbMouseClickDrag("Left", 5, 5, 150, 50)
diff --git a/AhkDll.Ahk/v2/test/mode 1.ahk b/AhkDll.Ahk/v2/test/mode 1.ahk
@@ -10,6 +10,6 @@ WinWaitActive("ahk_class #32770")
 Send("notepad`n")
 
 WinWaitActive("ahk_exe notepad.exe")
-Send("Hello world+1")
+Send("Hello world{!}")
 Sleep(100)
 MouseClickDrag("Left", 5, 5, 150, 50)
diff --git a/AhkDll.Ahk/v2/test/mode ahk.ahk b/AhkDll.Ahk/v2/test/mode ahk.ahk
@@ -5,6 +5,6 @@ WinWaitActive("ahk_class #32770")
 Send("notepad`n")
 
 WinWaitActive("ahk_exe notepad.exe")
-Send("Hello world+1")
+Send("Hello world{!}")
 Sleep(100)
 MouseClickDrag("Left", 5, 5, 150, 50)
diff --git a/README.md b/README.md
@@ -13,8 +13,12 @@ An [AutoHotkey](https://www.autohotkey.com/) library that enables AHK to send ke
   No Razer hardware required, but it will be safer if you have one.  
   e.g. `IbSendInit("Razer")`
 * [DD Virtual Mouse & Virtual Keyboard](https://github.com/ddxoft/master)  
-  May cause a blue screen; difficult to uninstall cleanly.  
-  To use it, put the DLL (`DD94687.64.dll`/`DD64.dll`/`DDHID64.dll`) with your script file, or specify the path argument when call IbSendInit, e.g.:
+  May cause a blue screen; difficult to uninstall cleanly; need network.  
+  To use it, put the DLL (`DD94687.64.dll`/`DD64.dll`/`DDHID64.dll`) with your script file, and then:
+  ```ahk
+  IbSendInit("DD")
+  ```
+  or specify the DLL path when call IbSendInit:
   ```ahk
   IbSendInit("DD", 1, "C:\SomeDir\DD64.dll")
   ```
@@ -39,12 +43,14 @@ WinWaitActive("ahk_class #32770")
 Send("notepad`n")
 <br/>
 WinWaitActive("ahk_exe notepad.exe")
-Send("Hello world+1")
+Send("Hello world{!}")
 Sleep(100)
 MouseClickDrag("Left", 5, 5, 150, 50)</pre></td>
         <td><pre lang="ahk">; Run Notepad, type "Hello world!"
 ; and then select all text by mouse.
 <br/>
+#Include %A_ScriptDir%
+<br/>
 #Include IbAhkSend.ahk
 <br/>
 IbSendInit() ; IbSendInit("AnyDriver", 1)
@@ -54,7 +60,7 @@ WinWaitActive, ahk_class #32770
 Send notepad`n
 <br/>
 WinWaitActive, ahk_exe notepad.exe
-Send Hello world+1
+Send Hello world{!}
 Sleep 100
 CoordMode, Mouse, Client
 MouseClickDrag, Left, 5, 5, 150, 50</pre></td>
diff --git a/README.zh-Hans.md b/README.zh-Hans.md
@@ -13,8 +13,12 @@
   不需要雷蛇硬件，不过如果有的话会更安全。  
   用例：`IbSendInit("Razer")`
 * [DD 虚拟鼠标 & 虚拟键盘](https://github.com/ddxoft/master)  
-  可能会导致蓝屏；难以卸载干净。  
-  使用时需要把 DLL 文件（`DD94687.64.dll`/`DD64.dll`/`DDHID64.dll`）与你的脚本文件放到一起，或者在调用 IbSendInit 时指定路径参数：
+  可能会导致蓝屏；难以卸载干净；需要联网。  
+  使用时需要把 DLL 文件（`DD94687.64.dll`/`DD64.dll`/`DDHID64.dll`）与你的脚本文件放到一起，然后：
+  ```ahk
+  IbSendInit("DD")
+  ```
+  或者在调用 IbSendInit 时指定 DLL 路径：
   ```ahk
   IbSendInit("DD", 1, "C:\SomeDir\DD64.dll")
   ```
@@ -43,6 +47,8 @@ Sleep(100)
 MouseClickDrag("Left", 5, 5, 150, 50)</pre></td>
         <td><pre lang="ahk">; 运行记事本，输入“Hello world!”并通过鼠标全选文本。
 <br/>
+#Include %A_ScriptDir%
+<br/>
 #Include IbAhkSend.ahk
 <br/>
 IbSendInit() ; IbSendInit("AnyDriver", 1)
